[Pgp-tools-commit] r278 - in trunk: caff debian
Christoph Berg
myon at costa.debian.org
Mon May 1 22:53:59 UTC 2006
Author: myon
Date: 2006-05-01 22:53:58 +0000 (Mon, 01 May 2006)
New Revision: 278
Modified:
trunk/caff/README
trunk/caff/THANKS
trunk/caff/caff
trunk/debian/changelog
trunk/debian/control
Log:
+ Make local-user accept a list of keyids (Closes: #333832).
* Bump Standards-Version, no change.
Modified: trunk/caff/README
===================================================================
--- trunk/caff/README 2006-05-01 11:12:35 UTC (rev 277)
+++ trunk/caff/README 2006-05-01 22:53:58 UTC (rev 278)
@@ -42,19 +42,6 @@
After creating a ~/.caffrc from the template, caff almost works out of the box.
-
-MULTIPLE SIGNING KEYS
----------------------
-
-Q: I possess multiple keys. How can I use caff to sign each keyid
- with both my keys?
-A: Try this:
- $ caff --no-export-old --no-mail -u <mykey1> <keyids to sign>
- $ caff --no-download --no-export-old -u <mykey2> <keyids to sign>
-
-
-
-
--
Peter
$Id$
Modified: trunk/caff/THANKS
===================================================================
--- trunk/caff/THANKS 2006-05-01 11:12:35 UTC (rev 277)
+++ trunk/caff/THANKS 2006-05-01 22:53:58 UTC (rev 278)
@@ -1,5 +1,5 @@
Caff is not the work of a sole author. It wouldn't be what it is without the
-help of several people. I'ld like to say thank you to everybody who helped to
+help of several people. I'd like to say thank you to everybody who helped to
make caff better.
- Nick Mathewson
@@ -7,4 +7,4 @@
- And of course everyone who sent comments, suggestions or bug-reports.
-$Id$
+ -- Peter Palfrader <peter at palfrader.org> Thu, 15 Jul 2004 03:08:14 +0200
Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff 2006-05-01 11:12:35 UTC (rev 277)
+++ trunk/caff/caff 2006-05-01 22:53:58 UTC (rev 278)
@@ -85,6 +85,7 @@
=item B<-u> I<yourkeyid>, B<--local-user> I<yourkeyid>
Select the key that is used for signing, in case you have more than one key.
+To sign with multiple keys at once, separate multiple keyids by comma.
=item B<--key-file> I<file>
@@ -164,7 +165,7 @@
Path to your secret keyring. Default: B<$HOME/.gnupg/secring.gpg>.
-=item B<also-encrypt-to> [list of keyids]
+=item B<also-encrypt-to> [keyid, or list of keyids]
Additional keyids to encrypt messages to. Default: none.
@@ -203,9 +204,10 @@
Don't export UIDs by default, on which your latest signature is older
than this age. Default: B<24*60*60> (i.e. one day).
-=item B<local-user> [string]
+=item B<local-user> [keyid, or list of keyids]
Select the key that is used for signing, in case you have more than one key.
+With multiple keyids, sign with each key in turn.
=head2 Mail settings
@@ -400,7 +402,10 @@
# \$CONFIG{'keyid'} = [ qw{0123456789ABCDEF 89ABCDEF76543210} ];
$Ckeys\$CONFIG{'keyid'} = [ qw{@keys} ];
-# Additionally encrypt messages sent to these keyids
+# Select this/these keys to sign with
+#\$CONFIG{'local-user'} = [ qw{@keys} ];
+
+# Additionally encrypt messages for these keyids
#\$CONFIG{'also-encrypt-to'} = [ qw{@keys} ];
# Mail template to use for the encrypted part
@@ -761,7 +766,7 @@
if (ref($CONFIG{'also-encrypt-to'})) {
$gpg->options->push_recipients($_)
foreach @{$CONFIG{'also-encrypt-to'}};
- } else { # old syntax
+ } else {
$gpg->options->push_recipients($CONFIG{'also-encrypt-to'});
}
}
@@ -855,8 +860,9 @@
};
-
-my $USER;
+###################
+# argument handling
+###################
my @KEYIDS;
my $params;
@@ -900,16 +906,6 @@
$CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'};
push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
-if ($CONFIG{'local-user'}) {
- $USER = $CONFIG{'local-user'};
- $USER =~ s/^0x//i;
- unless ($USER =~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
- print STDERR "Local-user $USER is not a keyid.\n";
- usage(\*STDERR, 1);
- };
- $USER = uc($USER);
-};
-
for my $keyid (@ARGV) {
$keyid =~ s/^0x//i;
unless ($keyid =~ /^([A-F0-9]{8}|[A-F0-9]{16}||[A-F0-9]{40})$/i) {
@@ -1051,20 +1047,41 @@
}
unless ($CONFIG{'no-sign'}) {
+ my @local_user;
+ if ($CONFIG{'local-user'}) {
+ if (ref($CONFIG{'local-user'})) {
+ @local_user = @{$CONFIG{'local-user'}};
+ } else {
+ @local_user = split /\s*,\s*/, $CONFIG{'local-user'};
+ };
+ foreach (@local_user) {
+ s/^0x//i;
+ unless (/^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
+ print STDERR "Local-user $_ is not a keyid.\n";
+ usage(\*STDERR, 1);
+ };
+ $_ = uc($_);
+ };
+ } else {
+ @local_user = (undef);
+ };
+
info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
for my $keyid (@keyids_ok) {
- my @command;
- push @command, $CONFIG{'gpg-sign'};
- push @command, '--local-user', $USER if (defined $USER);
- push @command, "--homedir=$GNUPGHOME";
- push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
- push @command, '--no-auto-check-trustdb';
- push @command, '--trust-model=always';
- push @command, '--edit', $keyid;
- push @command, 'sign';
- push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
- print join(' ', @command),"\n";
- system (@command);
+ foreach my $local_user (@local_user) {
+ my @command;
+ push @command, $CONFIG{'gpg-sign'};
+ push @command, '--local-user', $local_user if (defined $local_user);
+ push @command, "--homedir=$GNUPGHOME";
+ push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
+ push @command, '--no-auto-check-trustdb';
+ push @command, '--trust-model=always';
+ push @command, '--edit', $keyid;
+ push @command, 'sign';
+ push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
+ print join(' ', @command),"\n";
+ system (@command);
+ };
};
};
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-01 11:12:35 UTC (rev 277)
+++ trunk/debian/changelog 2006-05-01 22:53:58 UTC (rev 278)
@@ -5,6 +5,7 @@
(Closes: #356830).
+ Make local-user a config option, thanks to Michael C. Toren for the
patch (Closes: #361316).
+ + Make local-user accept a list of keyids (Closes: #333832).
+ Make also-encrypt-to a list, add a commented stanza to the default
config file (Closes: #325163).
+ Include mail-template in default config file, some minor syntax fixes.
@@ -12,8 +13,9 @@
* pgp-clean:
+ Import caff's getopt handling.
+ Add option to allow exporting subkeys (Closes: #359698).
+ * Bump Standards-Version, no change.
- -- Christoph Berg <myon at debian.org> Mon, 1 May 2006 13:06:14 +0200
+ -- Christoph Berg <myon at debian.org> Tue, 2 May 2006 00:50:00 +0200
signing-party (0.4.5-1) unstable; urgency=low
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2006-05-01 11:12:35 UTC (rev 277)
+++ trunk/debian/control 2006-05-01 22:53:58 UTC (rev 278)
@@ -4,7 +4,7 @@
Maintainer: Thijs Kinkhorst <kink at squirrelmail.org>
Uploaders: Simon Richter <sjr at debian.org>, Peter Palfrader <weasel at debian.org>, Christoph Berg <myon at debian.org>
Build-Depends: debhelper (>= 5)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.0
Package: signing-party
Architecture: all
More information about the Pgp-tools-commit
mailing list