From: myon <myon@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Wed, 16 Aug 2006 16:24:41 +0000 (+0000)
Subject: clean up keyid detection
X-Git-Url: https://git.sthu.org/?p=pgp-tools.git;a=commitdiff_plain;h=25959bbd9e216a97e6ebc86b851abf905b9b2244

clean up keyid detection

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

diff --git a/caff/caff b/caff/caff
index 8415af9..7994858 100755
--- a/caff/caff
+++ b/caff/caff
@@ -908,11 +908,11 @@ push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'ke
 
 for my $keyid (@ARGV) {
 	$keyid =~ s/^0x//i;
-	unless ($keyid =~ /^([A-F0-9]{8}|[A-F0-9]{16}||[A-F0-9]{40})$/i) {
-		if ($keyid =~ /^[A-F0-9]{32}$/) {
-			info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
-			next;
-		};
+	if ($keyid =~ /^[A-F0-9]{32}$/i) {
+		info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
+		next;
+	};
+	if ($keyid !~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
 		print STDERR "$keyid is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};