diff options
author | Joe Crayne <joe@jerkface.net> | 2019-07-13 21:18:22 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-07-13 21:18:22 -0400 |
commit | 3f29bdc88a068ec3eab91a8bac12757e3a106ceb (patch) | |
tree | 09507dcfed5524694a2280fd11fb607023f7ce8b /lib/Kiki.hs | |
parent | cc6775a52107f5425d668a4831f475d05dc113b5 (diff) |
Finished encapsulation of KeyDB.
Diffstat (limited to 'lib/Kiki.hs')
-rw-r--r-- | lib/Kiki.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kiki.hs b/lib/Kiki.hs index e5c4eb4..e919b88 100644 --- a/lib/Kiki.hs +++ b/lib/Kiki.hs | |||
@@ -496,7 +496,7 @@ installIpsecConf fw MyIdentity{myGpgAddress} cs = do | |||
496 | getMyIdentity :: KeyRingRuntime -> Maybe MyIdentity | 496 | getMyIdentity :: KeyRingRuntime -> Maybe MyIdentity |
497 | getMyIdentity rt = do | 497 | getMyIdentity rt = do |
498 | wk <- rtWorkingKey rt | 498 | wk <- rtWorkingKey rt |
499 | Hostnames wkaddr _ _ _ <- Just $ getHostnames (byKeyKey (rtKeyDB rt) Map.! keykey wk) | 499 | Hostnames wkaddr _ _ _ <- getHostnames <$> lookupKeyData (keykey wk) (rtKeyDB rt) |
500 | return $ MyIdentity wkaddr (fingerprint wk) | 500 | return $ MyIdentity wkaddr (fingerprint wk) |
501 | 501 | ||
502 | refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO () | 502 | refreshCache :: KeyRingRuntime -> Maybe FilePath -> IO () |
@@ -543,7 +543,7 @@ newtype UidHostname = UidHostname Char8.ByteString | |||
543 | newtype ResolvableHostname = ResolvableHostname Char8.ByteString | 543 | newtype ResolvableHostname = ResolvableHostname Char8.ByteString |
544 | 544 | ||
545 | listPeers :: KeyRingRuntime -> [Peer] | 545 | listPeers :: KeyRingRuntime -> [Peer] |
546 | listPeers rt = map (uncurry Peer) . filter notme . mapMaybe namedContact . Map.elems . byKeyKey . rtKeyDB $ rt | 546 | listPeers rt = map (uncurry Peer) . filter notme . mapMaybe namedContact . keyData . rtKeyDB $ rt |
547 | where | 547 | where |
548 | kk = keykey (fromJust $ rtWorkingKey rt) | 548 | kk = keykey (fromJust $ rtWorkingKey rt) |
549 | notme (_,kd) = keykey (keyPacket kd) /= kk | 549 | notme (_,kd) = keykey (keyPacket kd) /= kk |