diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gpg.hs | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -7,6 +7,7 @@ keysafe (0.20160832) UNRELEASED; urgency=medium * Server-side rate limiting and DOS protection. * server: Added --months-to-fill-half-disk option, defaulting to 12. * Several new dependencies. + * Another fix to gpg secret key list parser. -- Joey Hess <id@joeyh.name> Thu, 01 Sep 2016 11:42:27 -0400 @@ -42,8 +42,10 @@ listSecretKeys = map mk . parse . lines <$> readProcess "gpg" parse = extract [] Nothing . map (splitOn ":") extract c (Just keyid) (("uid":_:_:_:_:_:_:_:_:userid:_):rest) = extract ((userid, keyid):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 |