prepare for upload

[pgp-tools.git] / caff / pgp-fixkey

diff --git a/caff/pgp-fixkey b/caff/pgp-fixkey
index 5d179fe8fe5a9b7c3d7903dfff0dc6f9a6d8740f..48d47be19e717b581ea0c41822fb527eed90cd78 100755 (executable)
--- a/caff/pgp-fixkey
+++ b/caff/pgp-fixkey
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# pgp-clean  --  remove all non-self signatures from key
+# pgp-fixkey  --  remove broken packets from keys
 # $Id$
 #
 # Copyright (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
@@ -262,10 +262,12 @@ if (scalar @KEYIDS == 0) {
                if ($type eq 'pub') {
                        $thiskey = $keyid;
                        debug("Found key $thiskey");
+               } elsif (!defined $thiskey) {
+                       next;
                } elsif ($type eq 'sig' || $type eq 'rev') {
-                       if (($keyid eq '0' x 16) && ($created == 0)) {
-                               push @KEYIDS, $thiskey if defined $thiskey;
-                               info("Adding $thiskey");
+                       if (($keyid eq '0' x 16) || ($created eq "") || ($created == 0)) {
+                               push @KEYIDS, $thiskey;
+                               info("Key $thiskey needs cleaning.");
                                $thiskey = undef;
                        };
                };
@@ -289,6 +291,10 @@ for my $keyid (@KEYIDS) {
        };
        my $keyinfo = $stdout;
        my @publine = grep { /^pub/ } (split /\n/, $stdout);
+       if ($#publine < 0) {
+               warn ("No public key found for $keyid.\n");
+               next;
+       }
        my (undef, undef, undef, undef, $longkeyid, undef, undef, undef, undef, undef, undef, $flags) = split /:/, pop @publine;
        my $can_encrypt = $flags =~ /E/;
        unless (defined $longkeyid) {
@@ -353,8 +359,8 @@ for my $keyid (@KEYIDS) {
                if (defined $line) { # only if we found a sig here - we never remove revocation packets for instance
                        debug("[sigremoval] doing line $line.");
                        my (undef, undef, undef, undef, $signer, $created, undef, undef, undef) = split /:/, $line;
-                       if ($signer eq ('0' x 16)) {
-                               debug("[sigremoval] not interested in that sig ($signer).");
+                       if (($signer eq '0' x 16) || ($created == 0)) {
+                               debug("[sigremoval] not interested in that sig ($signer, created: $created).");
                                $answer = "yes";
                        };
                } else {