From 27f408f64ce250938f236bc624fb4d4624fc1c62 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 16 Jul 2019 11:41:33 -0400 Subject: changes without effect --- lib/Transforms.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Transforms.hs b/lib/Transforms.hs index f3cd5e3..8a1da73 100644 --- a/lib/Transforms.hs +++ b/lib/Transforms.hs @@ -79,8 +79,7 @@ instance ASN1Object RSAPublicKey where fromASN1 (Start Sequence:IntVal n:IntVal e:End Sequence:xs) = Right (RSAKey (MPI n) (MPI e), xs) - fromASN1 _ = - Left "fromASN1: RSAPublicKey: unexpected format" + fromASN1 _ = Left "fromASN1: RSAPublicKey: unexpected format" -- | This type is used to describe events triggered by 'runKeyRing'. In @@ -778,7 +777,7 @@ selfAuthenticated k kd (UidString str) = and [ uid_topdomain parsed == "onion" , uid_realname parsed `elem` ["","Anonymous"] , uid_user parsed == "root" - , fmap (match . fst) (lookup (packet k) torbindings) == Just True + , fmap match torSubdom == Just True ] where parsed = parseUID str @@ -786,6 +785,7 @@ selfAuthenticated k kd (UidString str) = len = T.length (uid_subdomain parsed) subdom0 = L.fromChunks [encodeUtf8 (uid_subdomain parsed)] subdom = Char8.unpack subdom0 + torSubdom = fst <$> lookup (packet k) torbindings torbindings = getTorKeys (map packet $ flattenTop "" True kd) getTorKeys :: [Packet] -> [(Packet, (String, Packet))] -- cgit v1.2.3