summaryrefslogtreecommitdiff
path: root/lib/Kiki.hs
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Kiki.hs')
-rw-r--r--lib/Kiki.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 7825c85..9934aaa 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -462,7 +462,7 @@ getSshKnownHosts peer@Peer{kd} = Char8.unlines taggedblobs
462 462
463data MyIdentity = MyIdentity { 463data MyIdentity = MyIdentity {
464 myGpgAddress :: SockAddr, 464 myGpgAddress :: SockAddr,
465 myGpgKeyGrip :: String 465 myGpgKeyGrip :: Fingerprint
466} 466}
467 467
468installIpsecConf :: FileWriter -> MyIdentity -> [Peer] -> IO () 468installIpsecConf :: FileWriter -> MyIdentity -> [Peer] -> IO ()
@@ -495,7 +495,7 @@ getMyIdentity :: KeyRingRuntime -> Maybe MyIdentity
495getMyIdentity rt = do 495getMyIdentity rt = do
496 wk <- rtWorkingKey rt 496 wk <- rtWorkingKey rt
497 wkaddr <- gpgipv6addr . getHostnames <$> lookupKeyData (keykey wk) (rtKeyDB rt) 497 wkaddr <- gpgipv6addr . getHostnames <$> lookupKeyData (keykey wk) (rtKeyDB rt)
498 return $ MyIdentity wkaddr (show $ fingerprint wk) 498 return $ MyIdentity wkaddr (fingerprint wk)
499 499
500refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO () 500refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO ()
501refreshCache rt rootdir = do 501refreshCache rt rootdir = do
@@ -638,7 +638,7 @@ show_sshfp keyspec wkgrip db = do
638show_ssh :: String -> String -> KeyDB -> IO () 638show_ssh :: String -> String -> KeyDB -> IO ()
639show_ssh keyspec wkgrip db = either warn putStrLn $ show_ssh' keyspec wkgrip db 639show_ssh keyspec wkgrip db = either warn putStrLn $ show_ssh' keyspec wkgrip db
640 640
641show_ssh' :: String -> String -> KeyDB -> Either String String 641show_ssh' :: String -> Fingerprint -> KeyDB -> Either String String
642show_ssh' keyspec wkgrip db = do 642show_ssh' keyspec wkgrip db = do
643 let s = parseSpec wkgrip keyspec 643 let s = parseSpec wkgrip keyspec
644 flip (maybe . Left $ keyspec ++ ": not found") 644 flip (maybe . Left $ keyspec ++ ": not found")