remove stray debug output; strip 0x prefix from keyids

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index f3cb06338c22cc70f5e87d4209c26f4e1985b845..fe5fd9778d9e0dee3d99cc3485b07edf8486665b 100755 (executable)
--- 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.
 #
@@ -75,8 +75,9 @@ The configuration file is a perl script that sets values in the hash B<%CONFIG>.
 
 Example:
 
-       $CONFIG{'owner'}       = 'Peter Palfrader';
-       $CONFIG{'email'}       = 'peter@palfrader.org';
+       $CONFIG{owner} = q{Peter Palfrader};
+       $CONFIG{email} = q{peter@palfrader.org};
+       $CONFIG{keyid} = [ qw{DE7AAF6E94C09C7F 62AF4031C82E0039} ];
 
 =head2 Valid keys
 
@@ -147,6 +148,10 @@ If true, then skip the signing step. Default: B<0>.
 
 Peter Palfrader <peter@palfrader.org>
 
+=head1 WEBSITE
+
+http://pgp-tools.alioth.debian.org/
+
 =cut
 
 use strict;
@@ -166,7 +171,7 @@ my $VERSION = "0.0.0.$REVISION_NUMER";
 
 sub load_config() {
        my $config = $ENV{'HOME'} . '/.caffrc';
-       -f $config or die "No file $config present.  See caffrc(5).\n";
+       -f $config or die "No file $config present.  See caff(1).\n";
        unless (scalar eval `cat $config`) {
                die "Couldn't parse $config: $EVAL_ERROR\n" if $EVAL_ERROR;
        };
@@ -348,7 +353,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 +367,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;
 };
 
@@ -486,6 +491,7 @@ if ($ARGV[0] eq '-u') {
        usage() unless scalar @ARGV >= 3;
        shift @ARGV;
        $USER = shift @ARGV;
+       $USER =~ s/^0x//i;
        unless ($USER =~ /^[A-Za-z0-9]{8,8}([A-Za-z0-9]{8})?$/) {
                print STDERR "-u $USER is not a keyid.\n";
                usage();
@@ -493,6 +499,7 @@ if ($ARGV[0] eq '-u') {
        $USER = uc($USER);
 };
 for my $keyid (@ARGV) {
+       $keyid =~ s/^0x//i;
        unless ($keyid =~ /^[A-Za-z0-9]{8}([A-Za-z0-9]{8})?$/) {
                print STDERR "$keyid is not a keyid.\n";
                usage();
@@ -502,6 +509,31 @@ for my $keyid (@ARGV) {
 
 
 
+#################
+# import own keys
+#################
+       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();
+       $gpg->options->hash_init( 'extra_args' => [ '--with-colons', '--fixed-list-mode' ] );
+       my $pid = $gpg->list_public_keys(handles => $handles, command_args => $CONFIG{'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\n");
+               next;
+       };
+       foreach my $keyid (@{$CONFIG{'keyid'}}) {
+               unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
+                       info("Importing $keyid");
+                       system "gpg --export $keyid | gpg --import --homedir $GNUPGHOME";
+               }
+       }
+
 #############################
 # receive keys from keyserver
 #############################