[Pgp-tools-commit] r92 - trunk/caff

[Peter Palfrader]

Author: weasel
Date: 2005-06-29 12:18:56 +0000 (Wed, 29 Jun 2005)
New Revision: 92

Modified:
   trunk/caff/pgp-fixkey
Log:
Also remove signature packets without timestamp

Modified: trunk/caff/pgp-fixkey
===================================================================
--- trunk/caff/pgp-fixkey	2005-06-28 18:11:13 UTC (rev 91)
+++ trunk/caff/pgp-fixkey	2005-06-29 12:18:56 UTC (rev 92)
@@ -263,7 +263,7 @@
 			$thiskey = $keyid;
 			debug("Found key $thiskey");
 		} elsif ($type eq 'sig' || $type eq 'rev') {
-			if (($keyid eq '0' x 16) && ($created == 0)) {
+			if (($keyid eq '0' x 16) || ($created == 0)) {
 				push @KEYIDS, $thiskey if defined $thiskey;
 				info("Adding $thiskey");
 				$thiskey = undef;
@@ -353,8 +353,8 @@
 		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 {