diff options
author | Andrew Cady <d@jerkface.net> | 2019-07-16 17:51:31 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-07-16 17:52:10 -0400 |
commit | 7a94f5103671011295f818bfcf30280423c44042 (patch) | |
tree | 118d6a1d76d74e09e6a2dbef8ef49b8390a116cd /lib/Kiki.hs | |
parent | f07d60d9c0ff8673a264e984c90bc478987ef873 (diff) |
use more Fingerprint WIP
Diffstat (limited to 'lib/Kiki.hs')
-rw-r--r-- | lib/Kiki.hs | 6 |
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 | ||
463 | data MyIdentity = MyIdentity { | 463 | data MyIdentity = MyIdentity { |
464 | myGpgAddress :: SockAddr, | 464 | myGpgAddress :: SockAddr, |
465 | myGpgKeyGrip :: String | 465 | myGpgKeyGrip :: Fingerprint |
466 | } | 466 | } |
467 | 467 | ||
468 | installIpsecConf :: FileWriter -> MyIdentity -> [Peer] -> IO () | 468 | installIpsecConf :: FileWriter -> MyIdentity -> [Peer] -> IO () |
@@ -495,7 +495,7 @@ getMyIdentity :: KeyRingRuntime -> Maybe MyIdentity | |||
495 | getMyIdentity rt = do | 495 | getMyIdentity 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 | ||
500 | refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO () | 500 | refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO () |
501 | refreshCache rt rootdir = do | 501 | refreshCache rt rootdir = do |
@@ -638,7 +638,7 @@ show_sshfp keyspec wkgrip db = do | |||
638 | show_ssh :: String -> String -> KeyDB -> IO () | 638 | show_ssh :: String -> String -> KeyDB -> IO () |
639 | show_ssh keyspec wkgrip db = either warn putStrLn $ show_ssh' keyspec wkgrip db | 639 | show_ssh keyspec wkgrip db = either warn putStrLn $ show_ssh' keyspec wkgrip db |
640 | 640 | ||
641 | show_ssh' :: String -> String -> KeyDB -> Either String String | 641 | show_ssh' :: String -> Fingerprint -> KeyDB -> Either String String |
642 | show_ssh' keyspec wkgrip db = do | 642 | show_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") |