From 14bdf40ab9674dc9493f63ca34f392a43a5bd783 Mon Sep 17 00:00:00 2001 From: weasel Date: Sun, 7 Aug 2005 20:55:10 +0000 Subject: [PATCH 1/1] @#$T%GQt89v4h~! v3 keys git-svn-id: svn://svn.debian.org/pgp-tools/trunk@163 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/caff/caff b/caff/caff index 8e57fd2..73152a4 100755 --- a/caff/caff +++ b/caff/caff @@ -927,6 +927,7 @@ if ($CONFIG{'no-download'}) { # [GNUPG:] NODATA 1 # [GNUPG:] IMPORT_OK 0 25FC1614B8F87B52FF2F99B962AF4031C82E0039 my %local_keyids = map { $_ => 1 } @KEYIDS; + my $had_v3_keys = 0; for my $line (split /\n/, $status) { if ($line =~ /^\[GNUPG:\] IMPORT_OK \d+ ([0-9A-F]{40})/) { my $imported_key = $1; @@ -945,12 +946,16 @@ if ($CONFIG{'no-download'}) { delete $local_keyids{$speced_key}; unshift @keyids_ok, $imported_key; } elsif ($line =~ /^\[GNUPG:\] (NODATA|IMPORT_RES|IMPORTED) /) { + } elsif ($line =~ /^\[GNUPG:\] IMPORT_OK \d+ ([0-9A-F]{32})/) { + my $imported_key = $1; + notice ("Imported key $1 is a version 3 key. Version 3 keys are obsolete, should not be used, and are not and will not be properly supported."); + $had_v3_keys = 1; } else { notice ("got unknown reply from gpg: $line"); } }; if (scalar %local_keyids) { - notice ("Import failed for: ". (join ' ', keys %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); } }; -- 2.39.5