diff options
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -194,6 +194,7 @@ listKeysFiltered grips pkts = do | |||
194 | , formkind | 194 | , formkind |
195 | , " " | 195 | , " " |
196 | , fingerprint sub | 196 | , fingerprint sub |
197 | , kcipher sub | ||
197 | -- , " " ++ (torhash sub) | 198 | -- , " " ++ (torhash sub) |
198 | -- , " " ++ (concatMap (printf "%02X") $ S.unpack (ecc_curve sub)) | 199 | -- , " " ++ (concatMap (printf "%02X") $ S.unpack (ecc_curve sub)) |
199 | ] -- ++ ppShow hashed | 200 | ] -- ++ ppShow hashed |
@@ -202,6 +203,8 @@ listKeysFiltered grips pkts = do | |||
202 | -- then (" " ++ "BTC " ++ bitcoinAddress sub) : showsigs claimants | 203 | -- then (" " ++ "BTC " ++ bitcoinAddress sub) : showsigs claimants |
203 | then (" " ++ "¢ "++kind'++":" ++ bitcoinAddress netid sub) : showsigs claimants | 204 | then (" " ++ "¢ "++kind'++":" ++ bitcoinAddress netid sub) : showsigs claimants |
204 | else showsigs claimants | 205 | else showsigs claimants |
206 | kcipher k = if isSecretKey k then " " ++ ciphername (symmetric_algorithm k) | ||
207 | else "" | ||
205 | torkeys = do | 208 | torkeys = do |
206 | (code,(top,sub), kind, hashed,claimants) <- subs | 209 | (code,(top,sub), kind, hashed,claimants) <- subs |
207 | guard ("tor" `elem` kind) | 210 | guard ("tor" `elem` kind) |
@@ -236,7 +239,7 @@ listKeysFiltered grips pkts = do | |||
236 | listToMaybe $ filter match torkeys | 239 | listToMaybe $ filter match torkeys |
237 | unlines $ (" " ++ ar ++ "@" ++ " " ++ uid_full parsed) : showsigs secondary | 240 | unlines $ (" " ++ ar ++ "@" ++ " " ++ uid_full parsed) : showsigs secondary |
238 | -- (_,sigs) = unzip certs | 241 | -- (_,sigs) = unzip certs |
239 | "master-key " ++ fingerprint top ++ "\n" ++ uid ++" ...\n" ++ subkeys ++ "\n" | 242 | "master-key " ++ fingerprint top ++ kcipher top ++ "\n" ++ uid ++" ...\n" ++ subkeys ++ "\n" |
240 | 243 | ||
241 | 244 | ||
242 | {- | 245 | {- |