X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=8415af93cd7f2b9c083c666412278538c2172c0c;hb=96137d78cc59f874fd894a60fe1b006bfe9aecdf;hp=af8ae22671a4a40f85e3fa522bb403df9f04e7a6;hpb=66818ae697389eea714a997da1fbec96b273cedd;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index af8ae22..8415af9 100755
--- a/caff/caff
+++ b/caff/caff
@@ -4,7 +4,7 @@
 # $Id$
 #
 # Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
-# Copyright (c) 2005 Christoph Berg <cb@df7cb.de>
+# Copyright (c) 2005, 2006 Christoph Berg <cb@df7cb.de>
 #
 # All rights reserved.
 #
@@ -85,6 +85,7 @@ Do not sign the keys.
 =item B<-u> I<yourkeyid>, B<--local-user> I<yourkeyid>
 
 Select the key that is used for signing, in case you have more than one key.
+To sign with multiple keys at once, separate multiple keyids by comma.
 
 =item B<--key-file> I<file>
 
@@ -164,9 +165,9 @@ is set to.
 
 Path to your secret keyring.  Default: B<$HOME/.gnupg/secring.gpg>.
 
-=item B<also-encrypt-to> [keyid]
+=item B<also-encrypt-to> [keyid, or list of keyids]
 
-An additional keyid to encrypt messages to. Default: none.
+Additional keyids to encrypt messages to. Default: none.
 
 =item B<gpg-sign-args> [string]
 
@@ -203,6 +204,11 @@ This is useful for offline signing. Default: B<0>.
 Don't export UIDs by default, on which your latest signature is older
 than this age.  Default: B<24*60*60> (i.e. one day).
 
+=item B<local-user> [keyid, or list of keyids]
+
+Select the key that is used for signing, in case you have more than one key.
+With multiple keyids, sign with each key in turn.
+
 =head2 Mail settings
 
 =item B<mail> [boolean]
@@ -334,9 +340,12 @@ sub generate_config() {
 	my $gecos = defined $ENV{'LOGNAME'} ? (getpwnam($ENV{LOGNAME}))[6] : undef;
 	my $email;
 	my @keys;
-	my $hostname = `hostname -f`;
+	# BSD does not have hostname -f, so we try without -f first
+	my $hostname = `hostname`;
+	$hostname = `hostname -f` unless $hostname =~ /\./;
 	chomp $hostname;
 	my ($Cgecos,$Cemail,$Ckeys) = ('','','');
+
 	if (defined $gecos) {
 		$gecos =~ s/,.*//;
 
@@ -373,26 +382,39 @@ sub generate_config() {
 		($Cgecos,$Cemail,$Ckeys) = ('#','#','#');
 	};
 
-	return <<EOT;
-# .caffrc -- vim:syntax=perl:
+	my $template = <<EOT;
+# .caffrc -- vim:ft=perl:
 # This file is in perl(1) format - see caff(1) for details.
 
-$Cgecos\$CONFIG{'owner'}       = '$gecos';
-$Cemail\$CONFIG{'email'}       = '$email';
+$Cgecos\$CONFIG{'owner'} = '$gecos';
+$Cemail\$CONFIG{'email'} = '$email';
+#\$CONFIG{'reply-to'} = 'foo\@bla.org';
 
-# you can get your long keyid from
+# You can get your long keyid from
 #   gpg --with-colons --list-key <yourkeyid|name|emailaddress..>
 #
-# if you have a v4 key, it will simply be the last 16 digits of
+# If you have a v4 key, it will simply be the last 16 digits of
 # your fingerprint.
 #
 # Example:
-#   \$CONFIG{'keyid'}       = [ qw{FEDCBA9876543210} ];
+#   \$CONFIG{'keyid'} = [ qw{FEDCBA9876543210} ];
 #  or, if you have more than one key:
-#   \$CONFIG{'keyid'}       = [ qw{0123456789ABCDEF 89ABCDEF76543210} ];
+#   \$CONFIG{'keyid'} = [ qw{0123456789ABCDEF 89ABCDEF76543210} ];
+$Ckeys\$CONFIG{'keyid'} = [ qw{@keys} ];
+
+# Select this/these keys to sign with
+#\$CONFIG{'local-user'} = [ qw{@keys} ];
 
-$Ckeys\$CONFIG{'keyid'}       = [ qw{@keys} ];
+# Additionally encrypt messages for these keyids
+#\$CONFIG{'also-encrypt-to'} = [ qw{@keys} ];
+
+# Mail template to use for the encrypted part
+#\$CONFIG{'mail-template'} = << 'EOM';
 EOT
+
+	$template .= "#$_" foreach <DATA>;
+	$template .= "#EOM\n";
+	return $template;
 };
 
 sub check_executable($$) {
@@ -449,28 +471,9 @@ sub load_config() {
 	$CONFIG{'key-files'} = () unless defined $CONFIG{'key-files'};
 	$CONFIG{'mailer-send'} = [] unless defined $CONFIG{'mailer-send'};
 	die ("$PROGRAM_NAME: mailer-send is not an array ref in $config.\n") unless (ref $CONFIG{'mailer-send'} eq 'ARRAY');
-	$CONFIG{'mail-template'} = <<'EOM' unless defined $CONFIG{'mail-template'};
-Hi,
-
-please find attached the user id{(scalar @uids >= 2 ? 's' : '')}.
-{foreach $uid (@uids) {
-    $OUT .= "\t".$uid."\n";
-};} of your key {$key} signed by me.
-
-Note that I did not upload your key to any keyservers.
-If you have multiple user ids, I sent the signature for each user id
-separately to that user id's associated email address. You can import
-the signatures by running each through `gpg --import`.
-
-If you want this new signature to be available to others, please upload
-it yourself. With GnuPG this can be done using
-	gpg --keyserver subkeys.pgp.net --send-key {$key}
-
-If you have any questions, don't hesitate to ask.
-
-Regards,
-{$owner}
-EOM
+	unless (defined $CONFIG{'mail-template'}) {
+		$CONFIG{'mail-template'} .= $_ foreach <DATA>;
+	}
 };
 
 sub make_gpg_fds() {
@@ -632,7 +635,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, 2005 Peter Palfrader et al.";
+my $USER_AGENT = "caff $VERSION - http://pgp-tools.alioth.debian.org/";
 
 my $KEYSBASE =  $CONFIG{'caffhome'}.'/keys';
 my $GNUPGHOME = $CONFIG{'caffhome'}.'/gnupghome';
@@ -647,7 +650,7 @@ my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday);
 
 sub version($) {
 	my ($fd) = @_;
-	print $fd "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al.\n";
+	print $fd "caff $VERSION - (c) 2004, 2005, 2006 Peter Palfrader et al.\n";
 };
 
 sub usage($$) {
@@ -759,7 +762,14 @@ sub send_mail($$$@) {
 		$gpg->options->meta_interactive( 0 );
 		my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 		$gpg->options->push_recipients( $key_id );
-		$gpg->options->push_recipients( $CONFIG{'also-encrypt-to'} ) if defined $CONFIG{'also-encrypt-to'};
+		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'});
+			}
+		}
 		my $pid = $gpg->encrypt(handles => $handles);
 		my ($stdout, $stderr, $status) = readwrite_gpg($message, $inputfd, $stdoutfd, $stderrfd, $statusfd);
 		waitpid $pid, 0;
@@ -850,8 +860,9 @@ sub delete_signatures($$$$$$) {
 };
 
 
-
-my $USER;
+###################
+# argument handling
+###################
 my @KEYIDS;
 my $params;
 
@@ -888,17 +899,12 @@ if ($params->{'version'}) {
 };
 usage(\*STDERR, 1) unless scalar @ARGV >= 1;
 
-
-
-if ($params->{'local-user'}) {
-	$USER = $params->{'local-user'};
-	$USER =~ s/^0x//i;
-	unless ($USER =~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
-		print STDERR "-u $USER is not a keyid.\n";
-		usage(\*STDERR, 1);
-	};
-	$USER = uc($USER);
-};
+$CONFIG{'local-user'}  = $params->{'local-user'}  if defined $params->{'local-user'};
+$CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
+$CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined $params->{'no-mail'};
+$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) {
 	$keyid =~ s/^0x//i;
@@ -913,13 +919,6 @@ for my $keyid (@ARGV) {
 	push @KEYIDS, uc($keyid);
 };
 
-$CONFIG{'no-download'} = $params->{'no-download'} if defined $params->{'no-download'};
-$CONFIG{'no-mail'}     = $params->{'no-mail'}     if defined $params->{'no-mail'};
-$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'};
-
-
 #################
 # import own keys
 #################
@@ -1026,6 +1025,12 @@ if ($CONFIG{'no-download'}) {
 	if (scalar %local_keyids) {
 		notice ("Import failed for: ". (join ' ', keys %local_keyids)."." . ($had_v3_keys ? " (Or maybe it's one of those ugly v3 keys?)" :  ""));
 		exit 1 unless ask ("Some keys could not be imported - continue anyway?", 0);
+		if (scalar %local_keyids == 1) {
+			mywarn("Assuming ". (join ' ', keys %local_keyids)." is a fine keyid.");
+		} else {
+			mywarn("Assuming ". (join ' ', keys %local_keyids)." are fine keyids.");
+		};
+		push @keyids_ok, keys %local_keyids;
 	}
 };
 
@@ -1042,20 +1047,41 @@ if ($CONFIG{'ask-sign'} && ! $CONFIG{'no-sign'}) {
 }
 	
 unless ($CONFIG{'no-sign'}) {
+	my @local_user;
+	if ($CONFIG{'local-user'}) {
+		if (ref($CONFIG{'local-user'})) {
+			@local_user = @{$CONFIG{'local-user'}};
+		} else {
+			@local_user = split /\s*,\s*/, $CONFIG{'local-user'};
+		};
+		foreach (@local_user) {
+			s/^0x//i;
+			unless (/^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
+				print STDERR "Local-user $_ is not a keyid.\n";
+				usage(\*STDERR, 1);
+			};
+			$_ = uc($_);
+		};
+	} else {
+		@local_user = (undef);
+	};
+
 	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, '--no-auto-check-trustdb';
-		push @command, '--trust-model=always';
-		push @command, '--edit', $keyid;
-		push @command, 'sign';
-		push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
-		print join(' ', @command),"\n";
-		system (@command);
+		foreach my $local_user (@local_user) {
+			my @command;
+			push @command, $CONFIG{'gpg-sign'};
+			push @command, '--local-user', $local_user if (defined $local_user);
+			push @command, "--homedir=$GNUPGHOME";
+			push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
+			push @command, '--no-auto-check-trustdb';
+			push @command, '--trust-model=always';
+			push @command, '--edit', $keyid;
+			push @command, 'sign';
+			push @command, split ' ', $CONFIG{'gpg-sign-args'} || "";
+			print join(' ', @command),"\n";
+			system (@command);
+		};
 	};
 };
 
@@ -1290,3 +1316,29 @@ for my $keyid (@keyids_ok) {
 	};
 
 };
+
+###########################
+# the default mail template
+###########################
+
+__DATA__
+Hi,
+
+please find attached the user id{(scalar @uids >= 2 ? 's' : '')}
+{foreach $uid (@uids) {
+    $OUT .= "\t".$uid."\n";
+};}of your key {$key} signed by me.
+
+If you have multiple user ids, I sent the signature for each user id
+separately to that user id's associated email address. You can import
+the signatures by running each through `gpg --import`.
+
+Note that I did not upload your key to any keyservers. If you want this
+new signature to be available to others, please upload it yourself.
+With GnuPG this can be done using
+	gpg --keyserver subkeys.pgp.net --send-key {$key}
+
+If you have any questions, don't hesitate to ask.
+
+Regards,
+{$owner}