[Pgp-tools-commit] r362 - in trunk: debian keylookup

[thijs at alioth.debian.org]

Author: thijs
Date: 2008-02-27 10:24:38 +0000 (Wed, 27 Feb 2008)
New Revision: 362

Modified:
   trunk/debian/changelog
   trunk/keylookup/keylookup
Log:
* keylookup: cope with 16 or 40 nibble keyids, thanks Philippe Teuwen
  (Closes: #466716).

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-18 20:10:40 UTC (rev 361)
+++ trunk/debian/changelog	2008-02-27 10:24:38 UTC (rev 362)
@@ -1,10 +1,15 @@
-signing-party (0.4.13-2) unreleased/unstable; urgency=low
+signing-party (0.4.13-2) unreleased; urgency=low
 
+  [ Christoph Berg ]
   * gpglist: Do not barf on revokers (rvk). Thanks to Faidon Liambotis for
     spotting.
 
- -- Christoph Berg <myon at debian.org>  Mon, 18 Feb 2008 21:07:42 +0100
+  [ Thijs Kinkhorst ]
+  * keylookup: cope with 16 or 40 nibble keyids, thanks Philippe Teuwen
+    (Closes: #466716).
 
+ -- Thijs Kinkhorst <thijs at debian.org>  Wed, 27 Feb 2008 11:23:33 +0100
+
 signing-party (0.4.13-1) unstable; urgency=low
 
   [ Christoph Berg ]

Modified: trunk/keylookup/keylookup
===================================================================
--- trunk/keylookup/keylookup	2008-02-18 20:10:40 UTC (rev 361)
+++ trunk/keylookup/keylookup	2008-02-27 10:24:38 UTC (rev 362)
@@ -210,7 +210,8 @@
 	
 	my %unique;
 	my @keys = grep { !$unique{$_}++ }
-		grep { /^[0-9A-Fa-f]{8}$/ }
+		# get the keyID; can be 8, 16 or 40 nibbles
+		grep { /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/ }
 		map { s/\s//g; $_ } <ERRFH>;
 	wait;
 
@@ -296,7 +297,7 @@
 	push @args,  '--recv-keys';
 	for my $keyid (@$keyids) {
 		# untaint keyids
-		my ($cleanid) = $keyid =~ /^([a-zA-Z0-9]{8})$/;
+		my ($cleanid) = $keyid =~ /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/;
 		warn ("keyid '$keyid' has unexpected format - skipping\n"), next
 			unless defined $cleanid;
 		push @args, $cleanid;