[Pgp-tools-commit] r854 - in trunk: caff debian gpgsigs

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-07-10 20:01:29 +0000 (Sun, 10 Jul 2016)
New Revision: 854

Modified:
   trunk/caff/caff
   trunk/debian/changelog
   trunk/gpgsigs/gpgsigs
Log:
Allow input produced by gpgparticipants(1) using gpg 2.1.13.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-07-10 20:01:19 UTC (rev 853)
+++ trunk/caff/caff	2016-07-10 20:01:29 UTC (rev 854)
@@ -1389,10 +1389,10 @@
         elsif (/^(#*)\d*\s+\[(.)\] Fingerprint(?:\(s\)|s)? OK\s+\[(.)\] ID OK\s*$/) {
             $goodblock = (!$1 and lc $2 eq 'x' and lc $3 eq 'x') ? 1 : 0;
         }
-        elsif (/^\s+Key fingerprint = ([A-F0-9]{32}|(?:[A-F0-9]{2} ){8}(?: [A-F0-9]{2}){8})$/) {
+        elsif (/^ {5,}Key fingerprint = ([A-F0-9]{32}|(?:[A-F0-9]{2} ){8}(?: [A-F0-9]{2}){8})$/) {
             mywarn("Ignoring v3 fingerprint ".($1 =~ y/ //dr).".  v3 keys are obsolete.");
         }
-        elsif (/^\s+Key fingerprint = ([A-F0-9]{40}|(?:[A-F0-9]{4} ){5}(?: [A-F0-9]{4}){5})$/) {
+        elsif (/^ {5,}(?:Key fingerprint = )?([A-F0-9]{40}|(?:[A-F0-9]{4} ){5}(?: [A-F0-9]{4}){5})$/) {
             my $fpr = ($1 =~ y/ //dr);
             if ($goodblock) {
                 info("Adding fingerprint $fpr", 1);

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2016-07-10 20:01:19 UTC (rev 853)
+++ trunk/debian/changelog	2016-07-10 20:01:29 UTC (rev 854)
@@ -2,6 +2,9 @@
 
   * gpg-key2latex, gpgsigs: Ignore "KEY_CONSIDERED" status output emitted by
     gpg 2.1.13 and later.
+  * caff, gpgsigs: Allow input produced by gpgparticipants(1) using gpg
+    2.1.13.  With this version, key IDs are not displayed by default and the
+    "Key fingerprint = " prefix is omitted.
 
  -- Guilhem Moulin <guilhem at guilhem.org>  Sun, 10 Jul 2016 17:27:39 +0200
 

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2016-07-10 20:01:19 UTC (rev 853)
+++ trunk/gpgsigs/gpgsigs	2016-07-10 20:01:29 UTC (rev 854)
@@ -106,9 +106,9 @@
 my (@keys, @shortkeys);
 open (TXT, '<', $keytxt) or die ("Cannot open $keytxt\n");
 while (<TXT>) {
-	if ( m/^pub  +(?:\d+)[DR]\/(?:0x)?([0-9A-F]{8}|[0-9A-F]{16}) [0-9]{4}-[0-9]{2}-[0-9]{2}/ ) {
+	if ( m/^pub {2,}[^ \/]+\/(?:0x)?([0-9A-F]{8}|[0-9A-F]{16}) [0-9]{4}-[0-9]{2}-[0-9]{2}/ ) {
 		push @shortkeys, $1;
-	} elsif ( m/^\s+Key fingerprint = ((?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}|[0-9A-F]{40})$/ ) {
+	} elsif ( m/^ {5,}(?:Key fingerprint = )?((?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}|[0-9A-F]{40})$/ ) {
 		push @keys, substr ($1 =~ y/ //dr, -16);
 	}
 }
@@ -416,13 +416,13 @@
 		next;
 	}
 
-	if ( m/^pub  +(?:\d+)[DR]\/(?:0x)?([0-9A-F]{8}|[0-9A-F]{16}) [0-9]{4}-[0-9]{2}-[0-9]{2}/ ) {
+	if ( m/^pub {2,}[^ \/]+\/(?:0x)?([0-9A-F]{8}|[0-9A-F]{16}) [0-9]{4}-[0-9]{2}-[0-9]{2}/ ) {
 		$key = $1;
 		print WRITE;
 		next;
 	}
 
-	if ( m/^\s+Key fingerprint = ((?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}|[0-9A-F]{40})$/ ) {
+	if ( m/^ {5,}(?:Key fingerprint = )?((?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}|[0-9A-F]{40})$/ ) {
 		# derive the keyid from the fingerprint if available
 		$key = substr $1 =~ y/ //dr, -16;
 		print WRITE;