3 files changed, 14 insertions, 2 deletions

diff --git a/kiki.hs b/kiki.hs
index eabfbf3..854bf23 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -194,6 +194,7 @@ listKeysFiltered grips pkts = do
                         , formkind
                         , " "
                         , fingerprint sub
+                        , kcipher sub
                         -- , " " ++ (torhash sub)
                         -- , " " ++ (concatMap (printf "%02X") $ S.unpack (ecc_curve sub))
                         ] -- ++ ppShow hashed
@@ -202,6 +203,8 @@ listKeysFiltered grips pkts = do
                         -- then ("      " ++ "BTC " ++ bitcoinAddress sub) : showsigs claimants
                         then ("      " ++ "¢ "++kind'++":" ++ bitcoinAddress netid sub) : showsigs claimants
                         else showsigs claimants
+        kcipher k = if isSecretKey k then " " ++ ciphername (symmetric_algorithm k)
+                                     else ""
         torkeys = do
             (code,(top,sub), kind, hashed,claimants) <- subs
             guard ("tor" `elem` kind)
@@ -236,7 +239,7 @@ listKeysFiltered grips pkts = do
                         listToMaybe $ filter match torkeys
             unlines $  (" " ++ ar ++ "@" ++ " " ++ uid_full parsed) : showsigs secondary
         -- (_,sigs) = unzip certs
-    "master-key " ++ fingerprint top ++ "\n" ++ uid ++"  ...\n" ++ subkeys ++ "\n"
+    "master-key " ++ fingerprint top ++ kcipher top ++ "\n" ++ uid ++"  ...\n" ++ subkeys ++ "\n"
 
 
 {-
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
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 3bc6330..f1bb27d 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -10,6 +10,7 @@ import Data.ASN1.BinaryEncoding
 import Data.ASN1.Encoding
 import Data.ASN1.Types
 import Data.Binary
+import Data.Char
 import Data.List
 import Data.Maybe
 import Data.Monoid
@@ -35,6 +36,11 @@ import CommandLine
 import KeyRing
 import DotLock
 
+ciphername Unencrypted = "-"
+ciphername TripleDES   = "3des"
+ciphername (SymmetricAlgorithm w8) = "cipher-"++show w8
+ciphername c = map toLower $ show c
+
 -- |
 -- Regenerate /var/cache/kiki
 refresh :: (FilePath -> FilePath) -> CommonArgsParsed -> IO ()