HandshakeData should include my session public, not my long term

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index bc7d7af8..493ae925 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -395,8 +395,8 @@ data HandshakeParams
             , hpCookieRemoteDhtkey    :: PublicKey
             }
 
-newHandShakeData :: TransportCrypto -> Nonce24 -> HandshakeParams -> SockAddr -> IO (Maybe HandshakeData)
-newHandShakeData crypto basenonce (HParam {hpOtherCookie,hpMySecretKey,hpCookieRemotePubkey,hpCookieRemoteDhtkey}) addr
+newHandShakeData :: TransportCrypto -> Nonce24 -> HandshakeParams -> SockAddr -> PublicKey -> IO (Maybe HandshakeData)
+newHandShakeData crypto basenonce (HParam {hpOtherCookie,hpMySecretKey,hpCookieRemotePubkey,hpCookieRemoteDhtkey}) addr mySessionPublic
     = do
     freshCookie
       <- case  nodeInfo (key2id hpCookieRemoteDhtkey) addr  of
@@ -418,7 +418,7 @@ newHandShakeData crypto basenonce (HParam {hpOtherCookie,hpMySecretKey,hpCookieR
       fmap (\freshCookie' ->
             HandshakeData
                 { baseNonce   = basenonce
-                , sessionKey  = toPublic hpMySecretKey
+                , sessionKey  = mySessionPublic
                 , cookieHash  = digest
                 , otherCookie = freshCookie'
                 }) freshCookie
@@ -515,7 +515,8 @@ freshCryptoSession  sessions
     n24 <- atomically $ transportNewNonce crypto
     state <- lookupSharedSecret crypto key remotePublicKey n24
     newBaseNonce <- atomically $ transportNewNonce crypto
-    mbMyhandshakeData <- newHandShakeData crypto newBaseNonce hp addr
+    newsession <- generateSecretKey
+    mbMyhandshakeData <- newHandShakeData crypto newBaseNonce hp addr (toPublic newsession)
     let encodeHandshake myhandshakeData = let plain = encodePlain myhandshakeData
     --                                        state = computeSharedSecret key remoteDhtPublicKey n24
                                               encrypted = encrypt state plain
@@ -529,7 +530,6 @@ freshCryptoSession  sessions
         sendHandshake sessions addr response_handshake
     ncMyPacketNonce0 <- atomically $ newTVar newBaseNonce
     cookie0 <- atomically $ newTVar (HaveCookie otherCookie)
-    newsession <- generateSecretKey
     ncHooks0 <- atomically $ newTVar (defaultHooks sessions)
     ncUnrecognizedHook0 <- atomically $ newTVar (defaultUnrecognizedHook sessions)
     ncIncomingTypeArray0 <- atomically $ newTVar (msgTypeArray sessions)