X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=06fc62db23ef1d96eb7021bd39ff47e65c4976f4;hb=855a696b9f9c1d14bae8fb6cd305545d2583cab3;hp=b7d19d71aff159d9fad76ec710a4f683ef0e3dff;hpb=de54917e506a6b5ce6dd4748890a19ccb0f29d0e;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index b7d19d7..06fc62d 100755
--- a/caff/caff
+++ b/caff/caff
@@ -3,7 +3,7 @@
 # caff  --  CA - Fire and Forget
 # $Id$
 #
-# Copyright (c) 2004 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
 #
 # All rights reserved.
 #
@@ -348,7 +348,7 @@ my $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT = '^\[GNUPG:\] (GET_BOOL keyedit.delsig|GET
 my $KEYEDIT_DELSUBKEY_PROMPT = '^\[GNUPG:\] GET_BOOL keyedit.remove.subkey';
 
 load_config;
-my $USER_AGENT = "caff $VERSION - (c) 2004 Peter Palfrader";
+my $USER_AGENT = "caff $VERSION - (c) 2004, 2005 Peter Palfrader";
 
 my $KEYSBASE =  $CONFIG{'caffhome'}.'/keys';
 my $GNUPGHOME = $CONFIG{'caffhome'}.'/gnupghome';
@@ -362,8 +362,8 @@ my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
 
 
 sub usage() {
-	print STDERR "caff $VERSION - (c) 2004 Peter Palfrader\n";
-	print STDERR "Usage: $PROGRAM_NAME [-u <yourkeyid] <keyid> [<keyid> ...]\n";
+	print STDERR "caff $VERSION - (c) 2004, 2005 Peter Palfrader\n";
+	print STDERR "Usage: $PROGRAM_NAME [-u <yourkeyid>] <keyid> [<keyid> ...]\n";
 	exit 1;
 };
 
@@ -463,7 +463,7 @@ $CONFIG{'owner'}
 
 	$message_entity->head->add("Subject", "Your signed PGP key 0x$key_id");
 	$message_entity->head->add("To", $address);
-	$message_entity->head->add("From", $CONFIG{'owner'}.' <'.$CONFIG{'email'}.'>');
+	$message_entity->head->add("From", '"'.$CONFIG{'owner'}.'" <'.$CONFIG{'email'}.'>');
 	$message_entity->head->add("User-Agent", $USER_AGENT);
 	$message_entity->send();
 	$message_entity->stringify();
@@ -518,21 +518,34 @@ if ($CONFIG{'no-download'}) {
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 	
-	my $pid = $gpg->recv_keys(handles => $handles, command_args => [ @KEYIDS ]);
-	my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
-	waitpid $pid, 0;
+	my @local_keyids = @KEYIDS;
+	for my $keyid (@local_keyids) {
+		info ("fetching $keyid...");
+		my $pid = $gpg->recv_keys(handles => $handles, command_args => [ $keyid ]);
+		my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
+		waitpid $pid, 0;
 
 # [GNUPG:] IMPORT_OK 0 5B00C96D5D54AEE1206BAF84DE7AAF6E94C09C7F
 # [GNUPG:] NODATA 1
 # [GNUPG:] NODATA 1
 # [GNUPG:] IMPORT_OK 0 25FC1614B8F87B52FF2F99B962AF4031C82E0039
-	for my $line (split /\n/, $status) {
-		if ($line =~ /^\[GNUPG:\] IMPORT_OK/) {
-			push @keyids_ok, shift @KEYIDS;
-		} elsif ($line =~ /^\[GNUPG:\] NODATA/) {
+		my $handled = 0;
+		for my $line (split /\n/, $status) {
+			if ($line =~ /^\[GNUPG:\] IMPORT_OK/) {
+				push @keyids_ok, shift @KEYIDS;
+				$handled = 1;
+				last;
+			} elsif ($line =~ /^\[GNUPG:\] NODATA/) {
+				push @keyids_failed, shift @KEYIDS;
+				$handled = 1;
+				last;
+			};
+		};
+		unless ($handled) {
+			notice ("Huh, what's up with $keyid?");
 			push @keyids_failed, shift @KEYIDS;
 		};
-	}
+	};
 	die ("Still keys in \@KEYIDS.  This should not happen.") if scalar @KEYIDS;
 	notice ("Import failed for: ". (join ' ', @keyids_failed).".") if scalar @keyids_failed;
 };
@@ -541,14 +554,15 @@ if ($CONFIG{'no-download'}) {
 # sign keys
 ###########
 unless ($CONFIG{'no-sign'}) {
-	info("Sign the following keys according to your policy...");
+	info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
 	for my $keyid (@keyids_ok) {
 		my @command;
 		push @command, $CONFIG{'gpg-sign'};
 		push @command, '--local-user', $USER if (defined $USER);
 		push @command, "--homedir=$GNUPGHOME";
 		push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
-		push @command, '--sign-key', $keyid;
+		push @command, '--edit', $keyid;
+		push @command, 'sign';
 		print join(' ', @command),"\n";
 		system (@command);
 	};