X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=ae922cd96d2f2e7020ba7f1bfe69f0740a8d0d0c;hb=ffeb72b98d41f9928a59792366e88146e4d8541a;hp=8415af93cd7f2b9c083c666412278538c2172c0c;hpb=a35a7302a1bcb2d71ef0e7b0d3655684769bc82c;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 8415af9..ae922cd 100755
--- a/caff/caff
+++ b/caff/caff
@@ -3,7 +3,7 @@
 # caff  --  CA - Fire and Forget
 # $Id$
 #
-# Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2004, 2005, 2006 Peter Palfrader <peter@palfrader.org>
 # Copyright (c) 2005, 2006 Christoph Berg <cb@df7cb.de>
 #
 # All rights reserved.
@@ -105,7 +105,7 @@ Import keys from file. Can be supplied more than once.
 
 =item $HOME/.caff/gnupghome/gpg.conf  -  gpg configuration
 
-useful options include use-agent, default-cert-level, etc.
+useful options include use-agent, keyserver-options, default-cert-level, etc.
 
 =back
 
@@ -116,9 +116,9 @@ The file is generated when it does not exist.
 
 Example:
 
-	$CONFIG{owner} = q{Peter Palfrader};
-	$CONFIG{email} = q{peter@palfrader.org};
-	$CONFIG{keyid} = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ];
+	$CONFIG{'owner'} = q{Peter Palfrader};
+	$CONFIG{'email'} = q{peter@palfrader.org};
+	$CONFIG{'keyid'} = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ];
 
 =head2 Required basic settings
 
@@ -171,7 +171,8 @@ Additional keyids to encrypt messages to. Default: none.
 
 =item B<gpg-sign-args> [string]
 
-Additional arguments to pass to gpg.  Default: none.
+Additional commands to pass to gpg after the "sign" command.
+Default: none.
 
 =head2 Keyserver settings
 
@@ -218,7 +219,7 @@ Do not prompt for sending mail, just do it. Default: B<0>.
 =item B<no-mail> [boolean]
 
 Do not prompt for sending mail. The messages are still written to
-$CONFIG{caffhome}/keys/. Default: B<0>.
+$CONFIG{'caffhome'}/keys/. Default: B<0>.
 
 =item B<mail-template> [string]
 
@@ -256,11 +257,11 @@ Default: none.
 Parameters to pass to Mail::Mailer.
 This could for example be
 
-	$CONFIG{mailer-send} =  [ 'smtp', Server => 'mail.server', Auth => ['user', 'pass'] ]
+	$CONFIG{'mailer-send'} =  [ 'smtp', Server => 'mail.server', Auth => ['user', 'pass'] ];
 
 to use the perl SMTP client or
 
-	$CONFIG{mailer-send} =  [ 'sendmail', '-o8' ]
+	$CONFIG{'mailer-send'} =  [ 'sendmail', '-o8' ];
 
 to pass arguments to the sendmail program.
 For more information run C<< perldoc Mail::Mailer >>.
@@ -297,6 +298,7 @@ use File::Path;
 use File::Temp qw{tempdir};
 use Text::Template;
 use MIME::Entity;
+use Encode;
 use Fcntl;
 use IO::Select;
 use Getopt::Long;
@@ -465,7 +467,8 @@ sub load_config() {
 	check_executable("gpg", $CONFIG{'gpg'});
 	check_executable("gpg-sign", $CONFIG{'gpg-sign'});
 	check_executable("gpg-delsig", $CONFIG{'gpg-delsig'});
-	$CONFIG{'secret-keyring'} = $ENV{'HOME'}.'/.gnupg/secring.gpg' unless defined $CONFIG{'secret-keyring'};
+	$CONFIG{'secret-keyring'} = ($ENV{'GNUPGHOME'} || "$ENV{'HOME'}/.gnupg") . '/secring.gpg'
+		unless defined $CONFIG{'secret-keyring'};
 	$CONFIG{'no-download'} = 0 unless defined $CONFIG{'no-download'};
 	$CONFIG{'no-sign'} = 0 unless defined $CONFIG{'no-sign'};
 	$CONFIG{'key-files'} = () unless defined $CONFIG{'key-files'};
@@ -799,7 +802,7 @@ sub send_mail($$$@) {
 
 	$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", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>');
 	$message_entity->head->add("Reply-To", $CONFIG{'reply-to'}) if defined $CONFIG{'reply-to'};
 	$message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'};
 	$message_entity->head->add("User-Agent", $USER_AGENT);
@@ -906,13 +909,14 @@ $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;
-	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;
-		};
+	$keyid =~ s/ //g; # gpg --fingerprint includes spaces
+	if ($keyid =~ /^[A-F0-9]{32}$/i) {
+		info("Ignoring v3 fingerprint $keyid.  v3 keys are obsolete.");
+		next;
+	};
+	if ($keyid !~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
 		print STDERR "$keyid is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};
@@ -1025,7 +1029,7 @@ 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) {
+		if (scalar keys %local_keyids == 1) {
 			mywarn("Assuming ". (join ' ', keys %local_keyids)." is a fine keyid.");
 		} else {
 			mywarn("Assuming ". (join ' ', keys %local_keyids)." are fine keyids.");