* Fixed that caff did not detect all invalid keyids (Closes: #317754).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@124 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 026f3daa8e1bf86ea265a27615a42fc663ae080b..8f728482167ddf8da436b38fc2adb4abc0ec84b3 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -266,7 +266,7 @@ sub load_config() {
        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'};

diff --git a/debian/changelog b/debian/changelog
index 7915c7270e14c40e48ac889f08e930d794f626ed..182da24e83b88cf527bc1e9242cb549c4dbc644a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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@squirrelmail.org>  Sat, 25 Jun 2005 16:27:42 +0200
+ -- Peter Palfrader <weasel@debian.org>  Wed, 29 Jun 2005 16:36:08 +0200
 
 signing-party (0.4.0-1) unstable; urgency=low