From: weasel Date: Thu, 15 Jul 2004 01:08:14 +0000 (+0000) Subject: Add nick's patch implementing --no-download and --no-sign. X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;ds=sidebyside;h=a01404114acb7f00c2245ad2c8322cfcebf57563;p=pgp-tools.git Add nick's patch implementing --no-download and --no-sign. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@18 b513b33f-fedd-0310-b452-c3deb5f4c849 --- diff --git a/caff/THANKS b/caff/THANKS new file mode 100644 index 0000000..054e5dc --- /dev/null +++ b/caff/THANKS @@ -0,0 +1,10 @@ +Caff is not the work of a sole author. It wouldn't be what it is without the +help of several people. I'ld like to say thank you to everybody who helped to +make caff better. + +- Nick Mathewson + For suggesting and implementing --no-download and --no-sign. + +- And of course everyone who sent comments, suggestions or bug-reports. + +$Id$ diff --git a/caff/caff b/caff/caff index a4ed598..8421fa8 100755 --- a/caff/caff +++ b/caff/caff @@ -118,7 +118,7 @@ Path to the GnuPG binary. Default: B. Path to the GnuPG binary which is used to sign keys. Default: what B is set to. -=item B [string] +=item B [string] Path to the GnuPG binary which is used to split off signatures. This is needed while the upstream GnuPG is not fixed (there are 2 bugs in the @@ -128,6 +128,19 @@ Debian Bug Tracking System). Default: what B is set to. Path to your secret keyring. Default: B<$HOME/.gnupg/secring.gpg>. +=item B [keyid] + +An additional keyid to encrypt messages to. Default: none. + +=item B [boolean] + +If true, then skip the step of fetching keys from the keyserver. +Default: B<0>. + +=item B [boolean] + +If true, then skip the signing step. Default: B<0>. + =back =head1 AUTHOR @@ -173,6 +186,8 @@ sub load_config() { $CONFIG{'gpg-sign'} = $CONFIG{'gpg'} unless defined $CONFIG{'gpg-sign'}; $CONFIG{'gpg-delsig'} = $CONFIG{'gpg'} unless defined $CONFIG{'gpg-delsig'}; $CONFIG{'secret-keyring'} = $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'}; }; sub notice($) { @@ -475,49 +490,57 @@ for my $keyid (@ARGV) { }; + ############################# # receive keys from keyserver ############################# -my $gpg = GnuPG::Interface->new(); -$gpg->call( $CONFIG{'gpg'} ); -$gpg->options->hash_init( - 'homedir' => $GNUPGHOME, - 'extra_args' => '--keyserver='.$CONFIG{'keyserver'} ); -$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 @keyids_ok; my @keyids_failed; +if ($CONFIG{'no-download'}) { + @keyids_ok = @KEYIDS; +} else { + my $gpg = GnuPG::Interface->new(); + $gpg->call( $CONFIG{'gpg'} ); + $gpg->options->hash_init( + 'homedir' => $GNUPGHOME, + 'extra_args' => '--keyserver='.$CONFIG{'keyserver'} ); + $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; + # [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/) { - 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; + for my $line (split /\n/, $status) { + if ($line =~ /^\[GNUPG:\] IMPORT_OK/) { + push @keyids_ok, shift @KEYIDS; + } elsif ($line =~ /^\[GNUPG:\] NODATA/) { + 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; +}; ########### # sign keys ########### -info("Sign the following keys according to your policy..."); -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; - print join(' ', @command),"\n"; - system (@command); +unless ($CONFIG{'no-sign'}) { + info("Sign the following keys according to your policy..."); + 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; + print join(' ', @command),"\n"; + system (@command); + }; }; ################## @@ -527,14 +550,14 @@ KEYS: for my $keyid (@keyids_ok) { # get key listing ################# - $gpg = GnuPG::Interface->new(); + my $gpg = GnuPG::Interface->new(); $gpg->call( $CONFIG{'gpg'} ); $gpg->options->hash_init( 'homedir' => $GNUPGHOME ); $gpg->options->meta_interactive( 0 ); - ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds(); + my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds(); $gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] ); - $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $keyid ]); - ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd); + my $pid = $gpg->list_public_keys(handles => $handles, command_args => [ $keyid ]); + my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd); waitpid $pid, 0; if ($stdout eq '') { warn ("No data from gpg for list-key $keyid\n");