summaryrefslogtreecommitdiff
path: root/lib/KeyRing
diff options
context:
space:
mode:
Diffstat (limited to 'lib/KeyRing')
-rw-r--r--lib/KeyRing/BuildKeyDB.hs6
-rw-r--r--lib/KeyRing/Types.hs2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index 0eddc51..587d812 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -127,7 +127,7 @@ buildKeyDB ctx grip0 keyring = do
127 ringPackets <- Map.traverseWithKey readp ringMap 127 ringPackets <- Map.traverseWithKey readp ringMap
128 let _ = ringPackets :: Map.Map InputFile (StreamInfo, Message) 128 let _ = ringPackets :: Map.Map InputFile (StreamInfo, Message)
129 129
130 let grip = grip0 `mplus` (fingerprint <$> fstkey) 130 let grip = grip0 `mplus` (show . fingerprint <$> fstkey)
131 where 131 where
132 fstkey = do 132 fstkey = do
133 (_,Message ps) <- Map.lookup HomeSec ringPackets 133 (_,Message ps) <- Map.lookup HomeSec ringPackets
@@ -691,7 +691,7 @@ insertSubkey transcode kk (KeyData top topsigs uids subs) tags inputfile key0 =
691 sig_ov <- pgpSign (Message [wkun]) 691 sig_ov <- pgpSign (Message [wkun])
692 tor_ov 692 tor_ov
693 SHA1 693 SHA1
694 (fingerprint wkun) 694 (show $ fingerprint wkun)
695 flip (maybe $ return $ KikiSuccess (uids,[(fname, WarnFailedToMakeSignature)])) 695 flip (maybe $ return $ KikiSuccess (uids,[(fname, WarnFailedToMakeSignature)]))
696 (sig_ov >>= listToMaybe . signatures_over) 696 (sig_ov >>= listToMaybe . signatures_over)
697 $ \sig -> do 697 $ \sig -> do
@@ -1216,7 +1216,7 @@ fingerdress :: Packet -> SockAddr
1216fingerdress topk = fromMaybe zero $ Hosts.inet_pton addr_str 1216fingerdress topk = fromMaybe zero $ Hosts.inet_pton addr_str
1217 where 1217 where
1218 zero = SockAddrInet 0 0 1218 zero = SockAddrInet 0 0
1219 addr_str = colons $ "fd" ++ drop 10 (map toLower $ fingerprint topk) 1219 addr_str = colons $ "fd" ++ drop 10 (map toLower $ show $ fingerprint topk)
1220 colons (a:b:c:d:xs@(_:_)) = [a,b,c,d,':'] ++ colons xs 1220 colons (a:b:c:d:xs@(_:_)) = [a,b,c,d,':'] ++ colons xs
1221 colons xs = xs 1221 colons xs = xs
1222 1222
diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs
index 4a0b34e..5318b31 100644
--- a/lib/KeyRing/Types.hs
+++ b/lib/KeyRing/Types.hs
@@ -350,7 +350,7 @@ isTrust _ = False
350-- matchpr fp = Data.List.Extra.takeEnd (length fp) 350-- matchpr fp = Data.List.Extra.takeEnd (length fp)
351-- 351--
352matchpr :: String -> Packet -> String 352matchpr :: String -> Packet -> String
353matchpr fp k = reverse $ zipWith const (reverse (fingerprint k)) fp 353matchpr fp k = reverse $ zipWith const (reverse (show $ fingerprint k)) fp
354 354
355 355
356 356