handshake nonce debug prints

2 files changed, 15 insertions, 1 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 69982c81..5ad9c041 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -112,6 +112,7 @@ import qualified Data.HashMap.Strict as HashMap
 import Data.HashMap.Strict (HashMap)
 import qualified Data.Map.Strict as Map
 import Control.Concurrent (threadDelay)
+import DPut
 
 
 newCrypto :: IO TransportCrypto
@@ -321,6 +322,7 @@ netCryptoWithBackoff millisecs tox myseckey theirpubkey = do
                                         , hpTheirSessionKeyPublic = error "netCrypto: Unreachable! hpTheirSessionKeyPublic"
                                         }
                         n24' <- atomically $ transportNewNonce crypto
+                        dput XNetCrypto ("Handshake Nonce24: " <> show n24')
                         state <- lookupSharedSecret crypto myseckey theirDhtKey n24'
                         newBaseNonce <- atomically $ transportNewNonce crypto
                         mbMyhandshakeData <- newHandShakeData crypto newBaseNonce hp saddr
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index d192e42e..485c5219 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -553,8 +553,20 @@ cryptoNetHandler sessions addr (NetHandshake (Handshake (Cookie n24 ecookie) non
             (CookieData cookieTime remotePubkey remoteDhtkey) <- (decodePlain =<< decryptSymmetric symkey n24 ecookie)
             Right $ do -- IO Monad
             decrypted <- anyRight seckeys $ \key -> do
+                            dput XNetCrypto $ "cryptoNetHandler: remotePubkey =  " ++ show (key2id $ remotePubkey)
+                            dput XNetCrypto $ "cryptoNetHandler: nonce24 =  " ++ show nonce24
                             secret <- lookupSharedSecret crypto key remotePubkey nonce24
-                            return $ (key,) <$> (decodePlain =<< decrypt secret encrypted)
+                            let step1 = decrypt secret encrypted
+                            case step1 of
+                                Left s -> do
+                                    dput XNetCrypto $ "cryptoNetHandler: (decrypt) " ++ s
+                                    return (Left s)
+                                Right pln -> do
+                                    case decodePlain pln of
+                                        Left s -> do
+                                            dput XNetCrypto $ "cryptoNetHandler: (decodePlain) " ++ s
+                                            return (Left s)
+                                        Right x -> return (Right (key,x))
             return $ do -- Either Monad
             (key,HandshakeData { baseNonce, sessionKey, cookieHash, otherCookie }) <- decrypted
             -- check cookie time < 15 seconds ago