From 26d215428efbe6447ae319ae3bbfa7d39209688e Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Thu, 25 Aug 2016 12:41:59 -0400
Subject: Show cipher for password-protected keys.

---
 lib/KeyRing.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/KeyRing.hs')

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 80b7826..4e83d80 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -54,6 +54,7 @@ module KeyRing
     , keyflags
     -- * Miscelaneous Utilities
     , isKey
+    , isSecretKey
     , derRSA
     , derToBase32
     , backsig
@@ -2570,7 +2571,9 @@ makeMemoizingDecrypter operation ctx keys = do
                 case symmetric_algorithm wkun of
                     Unencrypted -> do
                         writeIORef unkeysRef (Map.insert kk wkun unkeys)
-                        ek <- encryptSecretKey pw dest_s2k dest_alg wkun
+                        ek <- if dest_alg==Unencrypted
+                                then return $ Just wkun
+                                else encryptSecretKey pw dest_s2k dest_alg wkun
                         case ek of
                             Nothing   -> return $ BadPassphrase
                             Just wken -> return $ KikiSuccess wken
-- 
cgit v1.2.3