diff options
author | Andrew Cady <d@jerkface.net> | 2014-05-07 02:30:48 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2014-05-07 02:30:48 -0400 |
commit | bfc85bbd625b252d537aaa924e9f8a963b2dfe33 (patch) | |
tree | 1bd3be74c29ba0716c2540df0f1d524842bb84b2 /kiki.hs | |
parent | f48861d8f12c3603cb25d7b79768b6031b3bbd1c (diff) | |
parent | f02732b70e71d3c36d576822fa5c1a71a22294a0 (diff) |
Merge branch 'master' of ssh://localhost/~joe/repo/kiki
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -84,7 +84,7 @@ import Data.OpenPGP.Util (verify,fingerprint) | |||
84 | [(a, Int)] -> [a] -> ([[a]], [a]) | 84 | [(a, Int)] -> [a] -> ([[a]], [a]) |
85 | readPublicKey :: Char8.ByteString -> RSAPublicKey | 85 | readPublicKey :: Char8.ByteString -> RSAPublicKey |
86 | show_all :: KeyDB -> IO () | 86 | show_all :: KeyDB -> IO () |
87 | show_key :: forall t. | 87 | show_id :: forall t. |
88 | String -> t -> Map.Map KeyRing.KeyKey KeyData -> IO () | 88 | String -> t -> Map.Map KeyRing.KeyKey KeyData -> IO () |
89 | show_pem :: String -> String -> KeyDB -> IO () | 89 | show_pem :: String -> String -> KeyDB -> IO () |
90 | show_ssh :: String -> String -> KeyDB -> IO () | 90 | show_ssh :: String -> String -> KeyDB -> IO () |
@@ -299,7 +299,7 @@ show_ssh keyspec wkgrip db = do | |||
299 | blob = Base64.encode (L.unpack bs) | 299 | blob = Base64.encode (L.unpack bs) |
300 | putStrLn $ "ssh-rsa " ++ blob | 300 | putStrLn $ "ssh-rsa " ++ blob |
301 | 301 | ||
302 | show_key keyspec wkgrip db = do | 302 | show_id keyspec wkgrip db = do |
303 | let s = parseSpec "" keyspec | 303 | let s = parseSpec "" keyspec |
304 | let ps = do | 304 | let ps = do |
305 | (_,k) <- filterMatches (fst s) (Map.toList db) | 305 | (_,k) <- filterMatches (fst s) (Map.toList db) |
@@ -750,7 +750,7 @@ sync bExport bImport bSecret cmdarg args_raw = do | |||
750 | let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip) | 750 | let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip) |
751 | {-,("--show-all",const show_all) | 751 | {-,("--show-all",const show_all) |
752 | ,("--show-whose-key", const $ show_whose_key input_key) | 752 | ,("--show-whose-key", const $ show_whose_key input_key) |
753 | ,("--show-key",\[x] -> show_key x $ fromMaybe "" grip) | 753 | ,("--show-key",\[x] -> show_id x $ fromMaybe "" grip) |
754 | ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip) | 754 | ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip) |
755 | ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip) | 755 | ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip) |
756 | ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)-} | 756 | ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)-} |
@@ -859,7 +859,7 @@ kiki "show" args = do | |||
859 | let shspec = Map.fromList [("--working", const $ show_wk (rtSecring rt) grip) | 859 | let shspec = Map.fromList [("--working", const $ show_wk (rtSecring rt) grip) |
860 | ,("--all",const show_all) | 860 | ,("--all",const show_all) |
861 | ,("--whose-key", const $ show_whose_key input_key) | 861 | ,("--whose-key", const $ show_whose_key input_key) |
862 | ,("--key",\[x] -> show_key x $ fromMaybe "" grip) | 862 | ,("--key",\[x] -> show_id x $ fromMaybe "" grip) |
863 | ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip) | 863 | ,("--pem",\[x] -> show_pem x $ fromMaybe "" grip) |
864 | ,("--ssh",\[x] -> show_ssh x $ fromMaybe "" grip) | 864 | ,("--ssh",\[x] -> show_ssh x $ fromMaybe "" grip) |
865 | ,("--wip",\[x] -> show_wip x $ fromMaybe "" grip) | 865 | ,("--wip",\[x] -> show_wip x $ fromMaybe "" grip) |