diff options
-rw-r--r-- | kiki.hs | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -85,7 +85,7 @@ import Data.OpenPGP.Util (verify,fingerprint) | |||
85 | [(a, Int)] -> [a] -> ([[a]], [a]) | 85 | [(a, Int)] -> [a] -> ([[a]], [a]) |
86 | readPublicKey :: Char8.ByteString -> RSAPublicKey | 86 | readPublicKey :: Char8.ByteString -> RSAPublicKey |
87 | show_all :: KeyDB -> IO () | 87 | show_all :: KeyDB -> IO () |
88 | show_key :: forall t. | 88 | show_id :: forall t. |
89 | String -> t -> Map.Map KeyRing.KeyKey KeyData -> IO () | 89 | String -> t -> Map.Map KeyRing.KeyKey KeyData -> IO () |
90 | show_pem :: String -> String -> KeyDB -> IO () | 90 | show_pem :: String -> String -> KeyDB -> IO () |
91 | show_ssh :: String -> String -> KeyDB -> IO () | 91 | show_ssh :: String -> String -> KeyDB -> IO () |
@@ -300,7 +300,7 @@ show_ssh keyspec wkgrip db = do | |||
300 | blob = Base64.encode (L.unpack bs) | 300 | blob = Base64.encode (L.unpack bs) |
301 | putStrLn $ "ssh-rsa " ++ blob | 301 | putStrLn $ "ssh-rsa " ++ blob |
302 | 302 | ||
303 | show_key keyspec wkgrip db = do | 303 | show_id keyspec wkgrip db = do |
304 | let s = parseSpec "" keyspec | 304 | let s = parseSpec "" keyspec |
305 | let ps = do | 305 | let ps = do |
306 | (_,k) <- filterMatches (fst s) (Map.toList db) | 306 | (_,k) <- filterMatches (fst s) (Map.toList db) |
@@ -785,7 +785,7 @@ sync bExport bImport bSecret cmdarg args_raw = do | |||
785 | let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip) | 785 | let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip) |
786 | {-,("--show-all",const show_all) | 786 | {-,("--show-all",const show_all) |
787 | ,("--show-whose-key", const $ show_whose_key input_key) | 787 | ,("--show-whose-key", const $ show_whose_key input_key) |
788 | ,("--show-key",\[x] -> show_key x $ fromMaybe "" grip) | 788 | ,("--show-key",\[x] -> show_id x $ fromMaybe "" grip) |
789 | ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip) | 789 | ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip) |
790 | ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip) | 790 | ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip) |
791 | ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)-} | 791 | ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)-} |
@@ -891,7 +891,7 @@ kiki "show" args = do | |||
891 | let shspec = Map.fromList [("--working", const $ show_wk (rtSecring rt) grip) | 891 | let shspec = Map.fromList [("--working", const $ show_wk (rtSecring rt) grip) |
892 | ,("--all",const show_all) | 892 | ,("--all",const show_all) |
893 | ,("--whose-key", const $ show_whose_key input_key) | 893 | ,("--whose-key", const $ show_whose_key input_key) |
894 | ,("--key",\[x] -> show_key x $ fromMaybe "" grip) | 894 | ,("--key",\[x] -> show_id x $ fromMaybe "" grip) |
895 | ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip) | 895 | ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip) |
896 | ,("--ssh",\[x] -> show_ssh x $ fromMaybe "" grip) | 896 | ,("--ssh",\[x] -> show_ssh x $ fromMaybe "" grip) |
897 | ,("--wip",\[x] -> show_wip x $ fromMaybe "" grip) | 897 | ,("--wip",\[x] -> show_wip x $ fromMaybe "" grip) |