From: weasel <weasel@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sat, 16 Jul 2005 13:10:47 +0000 (+0000)
Subject: Do not use system to import keys into your caff gnupghome
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=9ef0fa8513c919284652e172c22ffb922c4ab8ea;hp=456d243465e2445f37aee9907a9254ae53705207;p=pgp-tools.git

Do not use system to import keys into your caff gnupghome

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@131 b513b33f-fedd-0310-b452-c3deb5f4c849
---

diff --git a/caff/caff b/caff/caff
index f9f814f..014b838 100755
--- a/caff/caff
+++ b/caff/caff
@@ -501,10 +501,16 @@ sub export_key($$) {
 
 	my $gpg = GnuPG::Interface->new();
 	$gpg->call( $CONFIG{'gpg'} );
-	$gpg->options->hash_init(
-		'homedir' => $gnupghome,
-		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ],
-		'armor' => 1 );
+	if (defined $gnupghome) {
+		$gpg->options->hash_init(
+			'homedir' => $gnupghome,
+			'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ],
+			'armor' => 1 );
+	} else {
+		$gpg->options->hash_init(
+			'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always } ],
+			'armor' => 1 );
+	};
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 	my $pid = $gpg->export_keys(handles => $handles, command_args => [ $keyid ]);
@@ -743,26 +749,35 @@ $CONFIG{'no-sign'}     = $params->{'no-sign'}     if defined $params->{'no-sign'
 #################
 # import own keys
 #################
+for my $keyid (@{$CONFIG{'keyid'}}) {
 	my $gpg = GnuPG::Interface->new();
 	$gpg->call( $CONFIG{'gpg'} );
 	$gpg->options->hash_init(
 		'homedir' => $GNUPGHOME,
-		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode } ] );
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode --fast-list-mode } ] );
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
-	my $pid = $gpg->list_public_keys(handles => $handles, command_args => $CONFIG{'keyid'});
+	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\n");
-		next;
+		warn ("No data from gpg for list-key\n"); # There should be at least 'tru:' everywhere.
 	};
-	foreach my $keyid (@{$CONFIG{'keyid'}}) {
-		unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
-			info("Importing $keyid");
-			system "gpg --export $keyid | gpg --import --homedir $GNUPGHOME";
-		}
+	unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
+		info("Key $keyid not found in caff's home.  Getting it from your normal GnuPGHome.");
+		my $key = export_key(undef, $keyid);
+		if (!defined $key || $key eq '') {
+			warn ("Did not get key $keyid from your normal GnuPGHome\n");
+			next;
+		};
+		my $result = import_key($GNUPGHOME, $key);
+		unless ($result) {
+			warn ("Could not import $keyid into caff's gnupghome.\n");
+			next;
+		};
 	}
+}
 
 #############################
 # receive keys from keyserver