1 files changed, 8 insertions, 8 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 9934aaa..523c8c4 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -554,9 +554,9 @@ writePublicKeyFiles :: KeyRingRuntime -> FileWriter -> MyIdentity -> IO ()
 writePublicKeyFiles rt fw myId@(MyIdentity _ grip) = do
 
     -- Finally, export public keys if they do not exist.
-    either warn (write fw "root/.ssh/id_rsa.pub") $ show_ssh' "ssh-client" grip (rtKeyDB rt)
-    either warn (write fw "ssh_host_rsa_key.pub") $ show_ssh' "ssh-server" grip (rtKeyDB rt)
-    either warn (write fw $ ipsecCertPath myId) $ show_pem' "ipsec" grip (rtKeyDB rt) pemFromPacket
+    either warn (write fw "root/.ssh/id_rsa.pub") $ show_ssh' "ssh-client" (Just grip) (rtKeyDB rt)
+    either warn (write fw "ssh_host_rsa_key.pub") $ show_ssh' "ssh-server" (Just grip) (rtKeyDB rt)
+    either warn (write fw $ ipsecCertPath myId) $ show_pem' "ipsec" (Just grip) (rtKeyDB rt) pemFromPacket
 
     let cs          = listPeers rt
         known_hosts = L.concat $ map getSshKnownHosts $ cs
@@ -615,10 +615,10 @@ pemFromPacket k = do
     return $
         writePEM PemPublicKey qq -- ("TODO "++show keyspec)
 
-show_pem :: String -> String -> KeyDB -> IO ()
+show_pem :: String -> Maybe Fingerprint -> KeyDB -> IO ()
 show_pem keyspec wkgrip db = either warn putStrLn $ show_pem' keyspec wkgrip db pemFromPacket
 
-show_pem' :: String -> String -> KeyDB -> (Packet -> Either String b) -> Either String b
+show_pem' :: String -> Maybe Fingerprint -> KeyDB -> (Packet -> Either String b) -> Either String b
 show_pem' keyspec wkgrip db keyfmt = do
     let s = parseSpec wkgrip keyspec
     flip (maybe . Left $ keyspec ++ ": not found")
@@ -628,17 +628,17 @@ show_pem' keyspec wkgrip db keyfmt = do
 warn :: String -> IO ()
 warn str = hPutStrLn stderr str
 
-show_sshfp :: String -> String -> KeyDB -> IO ()
+show_sshfp :: String -> Maybe Fingerprint -> KeyDB -> IO ()
 show_sshfp keyspec wkgrip db = do
     let s = parseSpec wkgrip keyspec
     case selectPublicKey s db of
         Nothing -> hPutStrLn stderr $ keyspec ++ ": not found"
         Just k  -> Char8.putStrLn $ sshKeyToHostname k
 
-show_ssh :: String -> String -> KeyDB -> IO ()
+show_ssh :: String -> Maybe Fingerprint -> KeyDB -> IO ()
 show_ssh keyspec wkgrip db = either warn putStrLn $ show_ssh' keyspec wkgrip db
 
-show_ssh' :: String -> Fingerprint -> KeyDB -> Either String String
+show_ssh' :: String -> Maybe Fingerprint -> KeyDB -> Either String String
 show_ssh' keyspec wkgrip db = do
     let s = parseSpec wkgrip keyspec
     flip (maybe . Left $ keyspec ++ ": not found")