Show cipher for password-protected keys.

1 files changed, 4 insertions, 1 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"
 
 
 {-