[Pgp-tools-commit] r330 - in trunk: . caff debian

[myon at alioth.debian.org]

Author: myon
Date: 2007-06-25 09:18:41 +0000 (Mon, 25 Jun 2007)
New Revision: 330

Modified:
   trunk/
   trunk/caff/README.many-keys
   trunk/caff/README.v3-keys
   trunk/caff/caff
   trunk/debian/changelog
Log:
 r4496 at hubble:  cbe | 2007-06-25 11:06:37 +0200
 * Allow spaces in keyids/fingerprints for easier cut-and-paste.



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   + 6608baed-f860-425a-b175-671185fd8b8a:/pgp-tools-local/trunk:4496

Modified: trunk/caff/README.many-keys
===================================================================
--- trunk/caff/README.many-keys	2007-06-24 11:44:41 UTC (rev 329)
+++ trunk/caff/README.many-keys	2007-06-25 09:18:41 UTC (rev 330)
@@ -11,11 +11,13 @@
 
   caff and gpg allow you to specify the full fingerprint. This will save you
   from having to check the fingerprint yourself. If you have a text file with
-  all fingerprints (with all the spaces stripped from them), use that and then
-  run
+  all fingerprints, use that and then run
 
-  $ caff <options> `cat ksp-fingerprints.txt`
+  $ caff <options> "`cat ksp-fingerprints.txt`"
 
+  For convenience, caff also allows spaces in fingerprints/keyids as output by
+  gpg --fingerprint. (Remember to properly quote arguments as shown above.)
+
 * v3 keys are evil.
 
   V3 keys (pgp 2.6x keys) are deprecated.  Not only do they rely on md5 for
@@ -35,18 +37,14 @@
 
   Going through retrieving, signing, and mailing keys can help, e.g.:
 
-  $ caff --no-sign --no-export-old --no-mail `cat ksp-fingerprints.txt`
-  $ caff --no-download --no-export-old --no-mail `cat ksp-fingerprints.txt`
-  $ caff --no-download --no-sign --no-export-old `cat ksp-fingerprints.txt`
+  $ caff --no-sign --no-export-old --no-mail "`cat ksp-fingerprints.txt`"
+  $ caff --no-download --no-export-old --no-mail "`cat ksp-fingerprints.txt`"
+  $ caff --no-download --no-sign --no-export-old "`cat ksp-fingerprints.txt`"
 
-* If you have multiple local keys, only send mail once after signing with all.
+* If you have multiple local keys, use -u <mykey1>,<mykey2>.
 
-  caff will send out all previously done signatures in the message. (Of course
-  you have to configure $CONFIG{'keyid'} to contain all your key ids.)
+  $ caff -u <mykey1>,<mykey2> <keyids to sign>
 
-  $ caff --no-export-old --no-mail -u <mykey1> <keyids to sign>
-  $ caff --no-download --no-export-old -u <mykey2> <keyids to sign>
-
 * Use gpg-agent.
 
   See README.gpg-agent.
@@ -61,4 +59,4 @@
   prompt any more; you will have *not* to send out some mails. (And you have
   unwanted signatures lingering around in ~/.caff/gnupghome/pubring.gpg.)
 
- -- Christoph Berg <cb at df7cb.de>  Wed,  6 Jul 2005 13:46:16 +0200
+ -- Christoph Berg <cb at df7cb.de>  Mon, 25 Jun 2007 10:55:40 +0200

Modified: trunk/caff/README.v3-keys
===================================================================
--- trunk/caff/README.v3-keys	2007-06-24 11:44:41 UTC (rev 329)
+++ trunk/caff/README.v3-keys	2007-06-25 09:18:41 UTC (rev 330)
@@ -1,10 +1,10 @@
 v3 keys are evil
 ----------------
 
-The good thing about v4 keys is that the fingerprint ends contains the 8 byte
-(16 char) key id at the and and that the 8 byte key id likewise ends in the 4
-byte key id. For v3 keys it does not. This, and some issues with HKP key
-servers make the handling of v3 a PITA.
+The good thing about v4 keys is that the last 16 chars of the fingerprint are
+the same as the 8 byte keyid, and likewise the last 8 chars are the 4 byte
+keyid. For v3 keys that is not true. This, and some issues with HKP key servers
+make the handling of v3 a PITA.
 
 To sign v3 keys with caff, do the following:
 

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2007-06-24 11:44:41 UTC (rev 329)
+++ trunk/caff/caff	2007-06-25 09:18:41 UTC (rev 330)
@@ -909,8 +909,9 @@
 $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'};
 push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
 
-for my $keyid (@ARGV) {
+for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument
 	$keyid =~ s/^0x//i;
+	$keyid =~ s/ //g; # gpg --fingerprint includes spaces
 	if ($keyid =~ /^[A-F0-9]{32}$/i) {
 		info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
 		next;

Modified: trunk/debian/changelog
===================================================================