X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=e4f69a9155c29506c5e95ab39bfdb4c5b478cfd7;hb=03fe24eba2e5a9d1d829305aada0489cdf88f842;hp=014b8387e0176502583e93bda60964e0ba1dd350;hpb=9ef0fa8513c919284652e172c22ffb922c4ab8ea;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 014b838..e4f69a9 100755
--- a/caff/caff
+++ b/caff/caff
@@ -734,6 +734,10 @@ if ($params->{'local-user'}) {
 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;
+		};
 		print STDERR "$keyid is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};
@@ -1079,7 +1083,7 @@ for my $keyid (@keyids_ok) {
 			if (!$uid->{'is_uat'} && ($uid->{'text'} =~ /@/)) {
 				my $address = $uid->{'text'};
 				$address =~ s/.*<(.*)>.*/$1/;
-				if (ask("Send mail to '$address' for $uid->{'text'}?", 1, $CONFIG{'mail'})) {
+				if (ask("Send signature for $uid->{'text'} to '$address'?", 1, $CONFIG{'mail'})) {
 					my $mail = send_mail($address, $can_encrypt, $longkeyid, $uid, @attached);
 
 					my $keydir = "$KEYSBASE/$DATE_STRING";