[Pgp-tools-commit] r124 - in trunk: caff debian

[Thijs Kinkhorst]

Author: kink-guest
Date: 2005-07-11 11:06:21 +0000 (Mon, 11 Jul 2005)
New Revision: 124

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
* Fixed that caff did not detect all invalid keyids (Closes: #317754).


Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-07-06 20:43:57 UTC (rev 123)
+++ trunk/caff/caff	2005-07-11 11:06:21 UTC (rev 124)
@@ -266,7 +266,7 @@
 	die ("keyid is not defined.\n") unless defined $CONFIG{'keyid'};
 	die ("keyid is not an array ref\n") unless (ref $CONFIG{'keyid'} eq 'ARRAY');
 	for my $keyid (@{$CONFIG{'keyid'}}) {
-		$keyid =~ /^[A-Fa-z0-9]{16}$/ or die ("key $keyid is not a long (16 digit) keyid.\n");
+		$keyid =~ /^[A-Fa-f0-9]{16}$/ or die ("key $keyid is not a long (16 digit) keyid.\n");
 	};
 	@{$CONFIG{'keyid'}} = map { uc } @{$CONFIG{'keyid'}};
 	$CONFIG{'export-sig-age'}= 24*60*60 unless defined $CONFIG{'export-sig-age'};

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-06 20:43:57 UTC (rev 123)
+++ trunk/debian/changelog	2005-07-11 11:06:21 UTC (rev 124)
@@ -1,16 +1,12 @@
 signing-party (0.4.1-XXX) unreleased; urgency=low
 
   * Depend on libtext-template-perl as caff needs it.
-
- -- Peter Palfrader <weasel at debian.org>  Wed, 29 Jun 2005 16:36:08 +0200
-
-signing-party (0.4.1-1) unstable; urgency=low
-
   * gpg-key2ps now works with revoked subkeys, thanks Christof Douma
     (Closes: #311990).
   * Update to Standards-Version 3.6.2, no changes necessary.
+  * Fixed that caff did not detect all invalid keyids (Closes: #317754).
 
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Sat, 25 Jun 2005 16:27:42 +0200
+ -- Peter Palfrader <weasel at debian.org>  Wed, 29 Jun 2005 16:36:08 +0200
 
 signing-party (0.4.0-1) unstable; urgency=low