2 files changed, 8 insertions, 3 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 9220fd1e..2a0633f0 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -154,8 +154,9 @@ data HandshakeData = HandshakeData
     --  This prevents a replay attack where a new cookie is inserted into
     --  an old valid handshake packet
     , otherCookie :: Cookie Encrypted
-    -- ^ Other Cookie (used by the repient to respond to the handshake packet)
+    -- ^ Other Cookie (used by the recipient to respond to the handshake packet)
     }
+ deriving (Eq,Ord,Show)
 
 instance Sized HandshakeData where
     size = contramap baseNonce size
diff --git a/src/Network/Tox/Session.hs b/src/Network/Tox/Session.hs
index c672087f..968b3503 100644
--- a/src/Network/Tox/Session.hs
+++ b/src/Network/Tox/Session.hs
@@ -116,10 +116,14 @@ plainHandshakeH :: SessionParams
 plainHandshakeH sp saddr skey handshake = do
     let hd = runIdentity $ handshakeData handshake
         prelude = show saddr ++ " --> "
-    dput XNetCrypto $ prelude ++ "handshake: " ++ show (otherCookie hd, baseNonce hd)
+    dput XNetCrypto $ unlines $ map (prelude ++)
+        [ "handshake: auth=" ++ show (handshakeCookie handshake)
+        , "         : issuing=" ++ show (otherCookie hd)
+        , "         : baseNonce=" ++ show (baseNonce hd)
+        ]
     sent <- spGetSentHandshake sp skey saddr (handshakeCookie handshake) (otherCookie hd)
     -- TODO: this is always returning sent = Nothing
-    dput XNetCrypto $ " <-- (cached) handshake baseNonce" ++ show (fmap (baseNonce . snd) sent)
+    dput XNetCrypto $ " <-- (cached) handshake baseNonce " ++ show (fmap (baseNonce . snd) sent)
     forM_ sent $ \(hd_skey,hd_sent) -> do
     sk <- SessionKeys (spCrypto sp)
                       hd_skey