Fixed Onion.Transport.decrypt broken by side-effecting style

at commit 8039d812b7ea8ae566f8873452ac34597336ddfc.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 539e7cee..5c4544ca 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -685,19 +685,19 @@ decrypt :: TransportCrypto -> OnionMessage Encrypted -> OnionDestination r -> IO
 decrypt crypto msg addr = do
     (skey,pkey) <- selectKey crypto msg addr
     let decipher1 :: Serialize a =>
-                     TransportCrypto -> SecretKey -> PublicKey -> Nonce24
+                     TransportCrypto -> SecretKey -> Nonce24
                      -> Either (PublicKey,Encrypted a) (Asymm (Encrypted a))
                      -> (IO ∘ Either String ∘ Identity) a
-        decipher1 crypto k pk n d = Composed $ do
-            secret <- lookupSharedSecret crypto k pk n
-            let ciphered = either snd asymmData d
+        decipher1 crypto k n arg = Composed $ do
+            let (sender,e) = either id (senderKey &&& asymmData) arg
+            secret <- lookupSharedSecret crypto k sender n
             return $ Composed $ do
-                plain <- ToxCrypto.decrypt secret ciphered
+                plain <- ToxCrypto.decrypt secret e
                 Identity <$> decodePlain plain
         decipher :: Serialize a
             => Nonce24 -> Either (Encrypted a) (Asymm (Encrypted a))
                        -> (IO ∘ Either String ∘ Identity) a
-        decipher = (\n -> decipher1 crypto skey pkey n . left (senderkey addr))
+        decipher = (\n -> decipher1 crypto skey n . left (senderkey addr))
     foo <- sequenceMessage $ transcode decipher msg
     return $ do
         msg <- sequenceMessage foo
@@ -726,7 +726,6 @@ decryptMessage crypto (sk,pk) n arg = do
     secret <- lookupSharedSecret crypto sk sender n
     return $ plain $ ToxCrypto.decrypt secret e
 
-
 sequenceMessage :: Applicative m => OnionMessage (m ∘ f) -> m (OnionMessage f)
 sequenceMessage (OnionAnnounce a)        = fmap OnionAnnounce $ sequenceA $ fmap uncomposed a
 sequenceMessage (OnionAnnounceResponse n8 n24 dta) = OnionAnnounceResponse n8 n24 <$> uncomposed dta