Use correct destination key when encrypting packets.

1 files changed, 8 insertions, 5 deletions

diff --git a/DHTTransport.hs b/DHTTransport.hs
index 013fa322..ac263cdc 100644
--- a/DHTTransport.hs
+++ b/DHTTransport.hs
@@ -307,15 +307,18 @@ forwardDHTRequests crypto closeLookup dht = dht { awaitMessage = await' }
         m -> pass m
 
 encrypt :: TransportCrypto -> DHTMessage ((,) Nonce8) -> NodeInfo -> (DHTMessage Encrypted8, NodeInfo)
-encrypt crypto msg ni = (transcode (encryptMessage crypto) msg, ni)
+encrypt crypto msg ni = ( transcode (encryptMessage crypto (id2key $ nodeId ni)) msg
+                        , ni )
 
 encryptMessage :: Serialize a =>
-                  TransportCrypto -> Nonce24 -> Either (Nonce8,a) (Assym (Nonce8,a)) -> Encrypted8 a
-encryptMessage crypto n (Right assym) = E8 $ ToxCrypto.encrypt secret plain
+                  TransportCrypto ->
+                  PublicKey ->
+                  Nonce24 -> Either (Nonce8,a) (Assym (Nonce8,a)) -> Encrypted8 a
+encryptMessage crypto destKey n (Right assym) = E8 $ ToxCrypto.encrypt secret plain
  where
-    secret = computeSharedSecret (transportSecret crypto) (senderKey assym) n
+    secret = computeSharedSecret (transportSecret crypto) destKey n
     plain  = encodePlain $ swap $ assymData assym
-encryptMessage crypto n (Left plain) = _todo -- need cached public key.
+encryptMessage crypto destKey n (Left plain) = _todo -- need cached public key.
 
 decrypt :: TransportCrypto -> DHTMessage Encrypted8 -> NodeInfo -> Either String (DHTMessage ((,) Nonce8), NodeInfo)
 decrypt crypto msg ni = (, ni) <$> (sequenceMessage $ transcode (decryptMessage crypto) msg)