cokiki build fix & show --packets option.

1 files changed, 6 insertions, 0 deletions

diff --git a/kiki.hs b/kiki.hs
index f42ee22..d3e505a 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -306,6 +306,10 @@ show_all db = do
     let Message packets = flattenKeys True db
     putStrLn $ listKeys packets
 
+show_packets puborsec db = do
+    let Message packets = flattenKeys (case puborsec of { "sec":_ -> False; _ -> True }) db
+    forM_ packets $ putStrLn . showPacket
+
 show_whose_key input_key db =
     flip (maybe $ return ()) input_key $ \input_key -> do
     let ks = whoseKey input_key db
@@ -1220,6 +1224,7 @@ kiki "show" args = do
                    , ("--dump",0)     --("--show-all",0)
                    , ("--all",0)     --("--show-all",0)
                    , ("--whose-key",0)
+                   , ("--packets",1)
                    , ("--key",1)
                    , ("--pem",1)
                    , ("--dns",1)
@@ -1271,6 +1276,7 @@ kiki "show" args = do
             let shspec = Map.fromList [("--working", const $ show_wk (rtSecring rt) grip)
                                       ,("--all",const show_all)
                                       ,("--whose-key", const $ show_whose_key input_key)
+                                      ,("--packets", show_packets)
                                       ,("--key",\[x] -> show_id x $ fromMaybe "" grip)
                                       ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip)
                                       ,("--dns",\[x] -> show_dns x $ fromMaybe "" grip)