From b6e61f8daed1a6c5bb6cecd545c71b04aaf86af9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 Sep 2016 13:30:50 -0400 Subject: Improve gpg secret key list parser to deal with changes in gpg 2.1.15. Fixes key name display in webapp. gpg 2.1.15 (or so) seems to have added some new fields to the --with-colons --list-secret-keys output. These include "fpr" and "grp", and come before the "uid" line. So, the parser was giving up before it saw the name. Fix by continuing to look for the uid line until the next "sec" line. This commit was sponsored by Ole-Morten,Duesund on Patreon. --- Utility/Gpg.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Utility/Gpg.hs') diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index 1ac03ef54..af740c3e0 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -178,8 +178,10 @@ secretKeys cmd = catchDefaultIO M.empty makemap parse = extract [] Nothing . map (split ":") extract c (Just keyid) (("uid":_:_:_:_:_:_:_:_:userid:_):rest) = extract ((keyid, decode_c userid):c) Nothing rest - extract c (Just keyid) rest = + extract c (Just keyid) rest@(("sec":_):_) = extract ((keyid, ""):c) Nothing rest + extract c (Just keyid) (_:rest) = + extract c (Just keyid) rest extract c _ [] = c extract c _ (("sec":_:_:_:keyid:_):rest) = extract c (Just keyid) rest -- cgit v1.2.3