- if ($line =~ /^\[GNUPG:\] IMPORT_OK \d+ ([0-9A-F]{8})([0-9A-F]{16})([0-9A-F]{8})([0-9A-F]{0,8})/) {
- my $imported_key;
- $imported_key = $1.$2.$3 if $local_keyids{$1.$2.$3}; # v3 key
- $imported_key = $1.$2.$3.$4 if $local_keyids{$1.$2.$3.$4};
- $imported_key = $3.$4 if $local_keyids{ $3.$4};
- $imported_key = $4 if $local_keyids{ $4};
- unless ($imported_key) {
- notice ("Imported unexpected key; got: $1$2$3$4. (This is normal for v3 keys.)\n");
+ if ($line =~ /^\[GNUPG:\] IMPORT_OK \d+ ([0-9A-F]{40})/) {
+ my $imported_key = $1;
+ my $whole_fpr = $imported_key;
+ my $long_keyid = substr($imported_key, -16);
+ my $short_keyid = substr($imported_key, -8);
+ my $speced_key;
+ for my $spec (($whole_fpr, $long_keyid, $short_keyid)) {
+ $speced_key = $spec if $local_keyids{$spec};
+ };
+ unless ($speced_key) {
+ notice ("Imported unexpected key; got: $imported_key\n");