[Pgp-tools-commit] r899 - in trunk: debian gpg-key2ps

[Guilhem Moulin]

Author: guilhem
Date: 2017-08-10 15:48:31 +0000 (Thu, 10 Aug 2017)
New Revision: 899

Modified:
   trunk/debian/changelog
   trunk/gpg-key2ps/gpg-key2ps
Log:
Add support for ECDH, ECDSA and EDDSA key types.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2017-07-07 15:07:24 UTC (rev 898)
+++ trunk/debian/changelog	2017-08-10 15:48:31 UTC (rev 899)
@@ -1,3 +1,12 @@
+signing-party (2.7-1) UNRELEASED; urgency=low
+
+  * gpg-key2ps:
+    + Add support for ECDH, ECDSA and EDDSA key types.
+    + Align key type & size listing to the GnuPG 2.1.x output (e.g.,
+      "rsa4096/DEADBEEF" instead of "4096R/DEADBEEF").
+
+ -- Guilhem Moulin <guilhem at debian.org>  Thu, 10 Aug 2017 11:40:03 -0400
+
 signing-party (2.6-1) unstable; urgency=low
 
   * gpgsigs:

Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps	2017-07-07 15:07:24 UTC (rev 898)
+++ trunk/gpg-key2ps/gpg-key2ps	2017-08-10 15:48:31 UTC (rev 899)
@@ -155,14 +155,14 @@
 } def
 
 /showAlgorithm {
-  << 1 (R) 2 (r) 3 (s) 16 (g) 20 (G) 17 (D) >> exch get
+  << 1 (rsa) 2 (rsa) 3 (rsa) 16 (elg) 17 (dsa) 20 (xxx) 18 (ecdh) 19 (ecdsa) 22 (eddsa) >> exch get
   show
 } def
 
 /pub {
 	condhline
 	50 y moveto (pub) show
-	70 y moveto show showAlgorithm (/) show show
+	70 y moveto showAlgorithm show (/) show show
 	150 y moveto show
 	200 y moveto show
 	newline
@@ -182,7 +182,7 @@
 
 /sbk {
 	50 y moveto (sub) show
-	70 y moveto show showAlgorithm (/) show show
+	70 y moveto showAlgorithm show (/) show show
 	150 y moveto show
 	newline
 } def
@@ -256,7 +256,7 @@
 		$numlines++;
 	}
 	# primary uid
-	s/^pub:[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:([^:]*):[^:]*:[^:]*:.*/	($5) ($4) ($3) $2 ($1) pub/;
+	s/^pub:[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:([^:]*):[^:]*:[^:]*:.*/	($5) ($4) ($3) ($1) $2 pub/;
 	# fingerprint, format it nicely with spaces
 	if ( /^fpr:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):.*/ ) {
 		next if $subkey;
@@ -277,10 +277,10 @@
 	}
 	# subkey
 	$subkey = 1 if /^sub:/;
-	if (s/^sub:[^r:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	($4) ($3) $2 ($1) sbk/) {
+	if (s/^sub:[^r:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	($4) ($3) ($1) $2 sbk/) {
 		next if ! $showsubkeys;
 	}
-	if (s/^sub:r[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	($4) ($3) $2 ($1) revsbk/) {
+	if (s/^sub:r[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	($4) ($3) ($1) $2 revsbk/) {
 		next if (!$showsubkeys) || $revokestyle eq "hide";
 	}
 	$numlines++;