Description: support both short and long gpg key id formats
Author: Alexander Zangerl <az@debian.org>
--- a/lib/pgpGpg.tcl
+++ b/lib/pgpGpg.tcl
@@ -385,12 +385,12 @@ set pgp(gpg,pat_dropKeys) {(^|\n)(pub|su
 set pgp(gpg,pat_splitKeys) \n
 # Patterns that match out interesting keys
 set pgp(gpg,pat_keySec) \
-                {^(pub|sec):[^:]*:[^:]*:([^:]*):[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]([^:]+):[^:]*:[^:]*:[^:]*:[^:]*:([^:]+).*$}
+		{^(pub|sec):[^:]*:[^:]*:([^:]*):([0-9A-F]+):[^:]*:[^:]*:[^:]*:[^:]*:([^:]+).*$}
 set pgp(gpg,pat_keySec_sub) \
-                {^(ssb):[^:]*:[^:]*:([^:]+):[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]([^:]+):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*.*$}
+                {^(ssb):[^:]*:[^:]*:([^:]+):([0-9A-F]+):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*.*$}
 set pgp(gpg,pat_keyPub) $pgp(gpg,pat_keySec)
 set pgp(gpg,pat_keyPub_sub) \
-                {^(sub):[^:]*:[^:]*:([^:]+):[0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]([^:]+):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*.*$}
+                {^(sub):[^:]*:[^:]*:([^:]+):([0-9A-F]+):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*.*$}
 set pgp(gpg,pat_uid) \
                 {^(uid):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]+).*$}
 # TclCmd to match out userid and keyid
@@ -442,7 +442,7 @@ set pgp(gpg,pat_checkError) "(BAD_PASSPH
 #######################
 # Exec_DetDecryptKeyid
 set pgp(gpg,args_getDecryptKeyid) {--dry-run $in}
-set pgp(gpg,pat_getDecryptKeyid) "NEED_PASSPHRASE ........(........)"
+set pgp(gpg,pat_getDecryptKeyid) "NEED_PASSPHRASE \[\[:alnum:]_]+ (\[\[:alnum:]_]+)"
 set pgp(gpg,pat_getDecryptSym) "NEED_PASSPHRASE_SYM"
 
 ###############
