X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=gpg-key2ps%2Fgpg-key2ps;fp=gpg-key2ps%2Fgpg-key2ps;h=74e3953dcb7f24d5454e069d9cf0c71a6c0eb58d;hb=e348439be6e8237d8a22901dc82c3f6ff86c6fb0;hp=fab1936a59837a806192a845baea8ddb919193c4;hpb=3e6648e9d2988775d405042b74e884bee29fd019;p=pgp-tools.git

diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index fab1936..74e3953 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -6,7 +6,7 @@
 
 set -e
 
-VERSION="0.4.0"
+VERSION='$Rev$'
 USAGE="Usage: $0 [-p papersize] [-r revoked-style] keyid-or-name"
 
 
@@ -118,10 +118,15 @@ cat <<EOF
 	/condhline { } def
 } def
 
+/showAlgorithm {
+  << 16 (g) 17 (D) 1 (R) >> exch get
+  show
+} def
+
 /pub {
 	condhline
 	50 y moveto (pub) show
-	70 y moveto show show (/) show show
+	70 y moveto show showAlgorithm (/) show show
 	150 y moveto show
 	200 y moveto show
 	newline
@@ -174,7 +179,7 @@ cat <<EOF
 
 /sbk {
 	50 y moveto (sub) show
-	70 y moveto show show (/) show show
+	70 y moveto show showAlgorithm (/) show show
 	150 y moveto show
 	newline
 } def
@@ -184,8 +189,7 @@ cat <<EOF
 EOF
 sed -e '/^tru:/d' \
     -e '/^uat:/d' \
-    -e 's/^pub:[^:]*:\([^:]*\):1:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:.*/	(\4) (\3) (\2) (R) (\1) pub/' \
-    -e 's/^pub:[^:]*:\([^:]*\):17:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:.*/	(\4) (\3) (\2) (D) (\1) pub/' \
+    -e 's/^pub:[^:]*:\([^:]*\):\([0-9]*\):.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:.*/	(\5) (\4) (\3) \2 (\1) pub/' \
     -e 's/^fpr:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/	(\1) fpr/' \
     -e 's/(\(.\{16,16\}\)\(.\{16,16\}\)) fpr/(@split@\1@  @split@\2@) fpr/' \
     -e 's/@split@\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)@/\1 \2 \3 \4 \5 \6 \7 \8/g' \
@@ -193,7 +197,7 @@ sed -e '/^tru:/d' \
     -e 's/@split@\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)@/\1 \2 \3 \4 \5/g' \
     -e 's/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/	(\1) uid/' \
     -e 's/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/	(\1) revuid/' \
-    -e 's/^sub:[^:]*:\([^:]*\):16:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	(\3) (\2) (g) (\1) sbk/' \
+    -e 's/^sub:[^:]*:\([^:]*\):\([0-9]*\):.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	(\4) (\3) \2 (\1) sbk/' \
     <$TMPFILE
 cat <<EOF
 } def