projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change wording for send mail question - maybe it makes at least some people send...
[pgp-tools.git]
/
caff
/
caff
diff --git
a/caff/caff
b/caff/caff
index 014b8387e0176502583e93bda60964e0ba1dd350..e4f69a9155c29506c5e95ab39bfdb4c5b478cfd7 100755
(executable)
--- 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) {
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);
};
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 (!$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";
my $mail = send_mail($address, $can_encrypt, $longkeyid, $uid, @attached);
my $keydir = "$KEYSBASE/$DATE_STRING";