From 0e478f8505d60ecaeefe55e23e2d8e824e44b9bd Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 30 Oct 2013 23:07:08 -0400 Subject: Support unencrypted keys for 'add' method. --- keys.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keys.hs b/keys.hs index c36a01e..7553ea3 100644 --- a/keys.hs +++ b/keys.hs @@ -1027,10 +1027,12 @@ main = do flip (maybe (error "No working key?")) grip $ \grip -> do let (pre, wk:subs) = seek_key grip sec - wkun = do - k <- decryptSecretKey pw wk - guard (symmetric_algorithm k == Unencrypted) - return k + wkun = if symmetric_algorithm wk == Unencrypted + then Just wk + else do + k <- decryptSecretKey pw wk + guard (symmetric_algorithm k == Unencrypted) + return k flip (maybe (error "Bad passphrase?")) wkun$ \wkun -> do -- cgit v1.2.3