1 files 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
+            wkun = if symmetric_algorithm wk == Unencrypted 
-                k <- decryptSecretKey pw wk 
+                    then Just wk
-                guard (symmetric_algorithm k == Unencrypted)
+                    else do
-                return k
+                        k <- decryptSecretKey pw wk 
+                        guard (symmetric_algorithm k == Unencrypted)
+                        return k
        flip (maybe (error "Bad passphrase?")) wkun$ \wkun -> do

diff --git a/keys.hs b/keys.hs index c36a01e..7553ea3 100644 --- a/keys.hs +++ b/keys.hs
@@ -1027,10 +1027,12 @@ main = do
1027	flip (maybe (error "No working key?")) grip $ \grip -> do	1027	flip (maybe (error "No working key?")) grip $ \grip -> do
1028		1028
1029	let (pre, wk:subs) = seek_key grip sec	1029	let (pre, wk:subs) = seek_key grip sec
1030	wkun = do	1030	wkun = if symmetric_algorithm wk == Unencrypted
1031	k <- decryptSecretKey pw wk	1031	then Just wk
1032	guard (symmetric_algorithm k == Unencrypted)	1032	else do
1033	return k	1033	k <- decryptSecretKey pw wk
		1034	guard (symmetric_algorithm k == Unencrypted)
		1035	return k
1034		1036
1035	flip (maybe (error "Bad passphrase?")) wkun$ \wkun -> do	1037	flip (maybe (error "Bad passphrase?")) wkun$ \wkun -> do
1036		1038