[Pgp-tools-commit] r887 - in trunk: debian gpgsigs

[Guilhem Moulin]

Author: guilhem-guest
Date: 2017-01-31 16:42:59 +0000 (Tue, 31 Jan 2017)
New Revision: 887

Modified:
   trunk/debian/changelog
   trunk/gpgsigs/gpgsigs
Log:
gpgsigs: skip unknown attributes.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2017-01-31 16:42:54 UTC (rev 886)
+++ trunk/debian/changelog	2017-01-31 16:42:59 UTC (rev 887)
@@ -2,6 +2,7 @@
 
   * gpgsigs:
     + Skip undefined UIDs.
+    + Properly handle (skip) unknown attributes.
 
  -- Guilhem Moulin <guilhem at guilhem.org>  Tue, 31 Jan 2017 17:32:58 +0100
 

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2017-01-31 16:42:54 UTC (rev 886)
+++ trunk/gpgsigs/gpgsigs	2017-01-31 16:42:59 UTC (rev 887)
@@ -243,8 +243,9 @@
 				}
 				chomp;
 				# see /usr/share/doc/gnupg/DETAILS.gz
-				if (/^\[GNUPG:\] ATTRIBUTE [0-9A-F]{24}([0-9A-F]{16}) (\d+) 1 1 1 \d+ \d+ (\d+)$/) {
-					push @photos, {key => $1, size => $2, revoked => $3 & 0x02};
+				if (/^\[GNUPG:\] ATTRIBUTE [0-9A-F]{24}([0-9A-F]{16}) (\d+) (\d+) (\d+) (\d+) \d+ \d+ (\d+)$/) {
+					my $show = $3 == 1 and $4 == 1  and $5 == 1 ? 1 : 0;
+					push @photos, {key => $1, size => $2, revoked => $6 & 0x02, show => $show};
 					next;
 				}
 				if (!/^\[GNUPG:\] (?:KEYEXPIRED \d+|SIGEXPIRED(?: deprecated-use-keyexpired-instead)?|KEY_CONSIDERED [0-9A-F]{40} \d+)$/) {
@@ -272,7 +273,7 @@
 		warn "Read $photo->{size} bytes but got $got bytes.\n" if $got != $photo->{size};
 	}
 
-	next if $photo->{revoked}; # ignore revoked attributes
+	next if $photo->{revoked} or !$photo->{show}; # ignore revoked attributes
 
 	my $key = $photo->{key};
 	my @uats = grep { $uids{$key}->{$_}->{type} eq 'uat' } @{$keys{$key}};