X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=8b9b701c66f3ffbf1dac528058f422bacd0ed178;hb=80c7628f16785ee7177e83349849b6b40db02498;hp=8ec09e3c7c2198cee41b797473a2d7f2d8c758b2;hpb=e2e129561e62e3c70d5cec9c08ae2283608ea18e;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 8ec09e3..8b9b701 100755
--- a/caff/caff
+++ b/caff/caff
@@ -477,6 +477,9 @@ sub load_config() {
 	unless (defined $CONFIG{'mail-template'}) {
 		$CONFIG{'mail-template'} .= $_ foreach <DATA>;
 	}
+	if ((defined $CONFIG{'also-encrypt-to'}) && ! (ref($CONFIG{'also-encrypt-to'}) eq 'ARRAY')) {
+		$CONFIG{'also-encrypt-to'} = [ $CONFIG{'also-encrypt-to'} ];
+	};
 };
 
 sub make_gpg_fds() {
@@ -766,19 +769,26 @@ sub send_mail($$$@) {
 		my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 		$gpg->options->push_recipients( $key_id );
 		if (defined $CONFIG{'also-encrypt-to'}) {
-			if (ref($CONFIG{'also-encrypt-to'})) {
-				$gpg->options->push_recipients($_)
-					foreach @{$CONFIG{'also-encrypt-to'}};
-			} else {
-				$gpg->options->push_recipients($CONFIG{'also-encrypt-to'});
-			}
+			$gpg->options->push_recipients($_) foreach @{$CONFIG{'also-encrypt-to'}};
 		}
 		my $pid = $gpg->encrypt(handles => $handles);
 		my ($stdout, $stderr, $status) = readwrite_gpg($message, $inputfd, $stdoutfd, $stderrfd, $statusfd);
 		waitpid $pid, 0;
 		if ($stdout eq '') {
-			warn ("No data from gpg for list-key $key_id\n");
-			next;
+			if (($status =~ /^\[GNUPG:\] INV_RECP ([0-9]+) ([0-9A-F]+)/m) and
+			    (defined $CONFIG{'also-encrypt-to'})) {
+				my $reason = $1;
+				my $keyid = $2;
+				if (grep { $_ eq $keyid } @{$CONFIG{'also-encrypt-to'}}) {
+					warn("Could not encrypt to $keyid, specified in CONFIG{'also-encrypt-to'}.\n".
+					     "Try to update the key using gpg --homedir=$GNUPGHOME --import <exported key>\n".
+					     "or try the following if you are slightly more daring:\n".
+					     " gpg --export $keyid | gpg --homedir=$GNUPGHOME --import\n");
+					return;
+				};
+			};
+			warn ("No data from gpg for encrypting mail.  STDERR was:\n$stderr\nstatus output was:\n$status\n");
+			return;
 		};
 		$message = $stdout;
 
@@ -788,6 +798,7 @@ sub send_mail($$$@) {
 
 		$message_entity->attach(
 			Type        => "application/pgp-encrypted",
+			Filename    => "signedkey.msg",
 			Disposition => 'attachment',
 			Encoding    => "7bit",
 			Data        => "Version: 1\n");
@@ -909,8 +920,9 @@ $CONFIG{'mail'}        = $params->{'mail'}        if defined $params->{'mail'};
 $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'};
 push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
 
-for my $keyid (@ARGV) {
+for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argument
 	$keyid =~ s/^0x//i;
+	$keyid =~ s/ //g; # gpg --fingerprint includes spaces
 	if ($keyid =~ /^[A-F0-9]{32}$/i) {
 		info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
 		next;
@@ -1307,12 +1319,15 @@ for my $keyid (@keyids_ok) {
 				$address =~ s/.*<(.*)>.*/$1/;
 				if (ask("Mail 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 $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'});
-					open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n");
-					print KEY $mail;
-					close KEY;
+					if (defined $mail) {
+						my $keydir = "$KEYSBASE/$DATE_STRING";
+						my $mailfile = "$keydir/$longkeyid.mail.".$uid->{'serial'}.".".sanitize_uid($uid->{'text'});
+						open (KEY, ">$mailfile") or die ("Cannot open $mailfile: $!\n");
+						print KEY $mail;
+						close KEY;
+					} else {
+						warn "Generating mail failed.\n";
+					};
 				};
 			};
 		};