4 files changed, 28 insertions, 23 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index f650a815..56fb4dcf 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -222,7 +222,7 @@ data NetCryptoSession = NCrypto
     , ncTheirBaseNonce     :: TVar (UponHandshake Nonce24) -- base nonce + packet number
     , ncMyPacketNonce      :: TVar Nonce24 -- base nonce + packet number
     , ncHandShake          :: TVar (UponHandshake (Handshake Encrypted))
-    , ncCookie             :: TVar (UponCookie Cookie) -- ^ Cookie issued by remote peer
+    , ncCookie             :: TVar (UponCookie (Cookie Encrypted)) -- ^ Cookie issued by remote peer
     , ncTheirDHTKey        :: UponDHTKey PublicKey
     , ncTheirSessionPublic :: TVar (UponHandshake PublicKey)
     , ncSessionSecret      :: SecretKey
@@ -387,7 +387,7 @@ newSessionsState crypto unrechook hooks = do
 data HandshakeParams
         = HParam
             { hpTheirBaseNonce        :: Maybe Nonce24 -- ignore and generate your own
-            , hpOtherCookie           :: Cookie
+            , hpOtherCookie           :: Cookie Encrypted
             , hpTheirSessionKeyPublic :: Maybe PublicKey
             , hpMySecretKey           :: SecretKey
             , hpCookieRemotePubkey    :: PublicKey
diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 0588da4b..e23d1865 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -99,7 +99,7 @@ data Handshake (f :: * -> *) = Handshake
       -- response packet with a cookie in it.  It may also be obtained in the
       -- handshake packet by a peer receiving a handshake packet (Other
       -- Cookie).
-      handshakeCookie :: Cookie
+      handshakeCookie :: Cookie f
       -- The nonce is a nonce used to encrypt the encrypted part of the handshake
       -- packet.
     , handshakeNonce :: Nonce24
@@ -113,10 +113,10 @@ instance Serialize (Handshake Encrypted) where
     put (Handshake cookie n24 dta) = put cookie >> put n24 >> put dta
 
 data HandshakeData = HandshakeData
-    { baseNonce :: Nonce24
-    , sessionKey :: PublicKey
-    , cookieHash :: Digest SHA512
-    , otherCookie :: Cookie
+    { baseNonce   :: Nonce24          -- ^ [24 bytes base nonce]
+    , sessionKey  :: PublicKey        -- ^ [session public key of the peer (32 bytes)]
+    , cookieHash  :: Digest SHA512    -- ^ [sha512 hash of the entire Cookie sitting outside the encrypted part]
+    , otherCookie :: Cookie Encrypted -- ^ [Other Cookie (used by the other to respond to the handshake packet)]
     }
 
 instance Sized HandshakeData where
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index af6eda8c..238fb0d0 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -92,7 +92,7 @@ instance Show PacketKind where
     showsPrec d (PacketKind x) = mappend "PacketKind " . showsPrec (d+1) x
 
 msgType :: ( Serialize (f DHTRequest)
-           , Serialize (f Cookie), Serialize (f CookieRequest)
+           , Serialize (f (Cookie Encrypted)), Serialize (f CookieRequest)
            , Serialize (f SendNodes), Serialize (f GetNodes)
            , Serialize (f Pong), Serialize (f Ping)
            ) => DHTMessage f -> PacketKind
@@ -218,7 +218,7 @@ getNodesH routing addr (GetNodes nid) = do
 
     k = 4
 
-createCookie :: TransportCrypto -> NodeInfo -> PublicKey -> IO Cookie
+createCookie :: TransportCrypto -> NodeInfo -> PublicKey -> IO (Cookie Encrypted)
 createCookie crypto ni remoteUserKey = do
     (n24,sym) <- atomically $ do
         n24 <- transportNewNonce crypto
@@ -234,7 +234,7 @@ createCookie crypto ni remoteUserKey = do
     dput XNetCrypto $ "Created cookie with n24 = 0x" ++ show n24 ++ "\n    sym=" ++ show sym
     return $ Cookie n24 edta
 
-cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO Cookie
+cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO (Cookie Encrypted)
 cookieRequestH crypto ni (CookieRequest remoteUserKey) = do
     dput XNetCrypto $ unlines
         [ "CookieRequest! remoteUserKey=" ++ show (key2id remoteUserKey)
@@ -311,7 +311,7 @@ loseCookieKey var saddr pk = do
         _                                     -> return () -- unreachable?
 
 
-cookieRequest :: TransportCrypto -> Client -> PublicKey -> NodeInfo -> IO (Maybe Cookie)
+cookieRequest :: TransportCrypto -> Client -> PublicKey -> NodeInfo -> IO (Maybe (Cookie Encrypted))
 cookieRequest crypto client localUserKey addr = do
     let sockAddr = nodeAddr addr
         nid = id2key $ nodeId addr
@@ -330,7 +330,7 @@ cookieRequest crypto client localUserKey addr = do
     dput XNetCrypto $ show addr ++ " -cookieResponse-> " ++ show reply
     return $ join reply
 
-unCookie :: DHTMessage t -> Maybe (t Cookie)
+unCookie :: DHTMessage t -> Maybe (t (Cookie Encrypted))
 unCookie (DHTCookie n24 fcookie) = Just fcookie
 unCookie _ = Nothing
 
@@ -416,7 +416,7 @@ isCookieRequest :: (f CookieRequest -> CookieRequest) -> DHTMessage f -> Either
 isCookieRequest unpack (DHTCookieRequest a) = Right $ unpack $ asymmData a
 isCookieRequest _      _                    = Left "Bad cookie request"
 
-mkCookie :: TransactionId -> NodeInfo -> NodeInfo -> Cookie -> DHTMessage ((,) Nonce8)
+mkCookie :: TransactionId -> NodeInfo -> NodeInfo -> Cookie Encrypted -> DHTMessage ((,) Nonce8)
 mkCookie (TransactionId n8 n24) src dst cookie = DHTCookie n24 (n8,cookie)
 
 isDHTRequest :: (f DHTRequest -> DHTRequest) -> DHTMessage f -> Either String DHTRequest
diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index 59b22673..5fdcd252 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE LambdaCase                 #-}
@@ -5,7 +7,7 @@
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TupleSections              #-}
 {-# LANGUAGE TypeOperators              #-}
-{-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE UndecidableInstances       #-}
 module Network.Tox.DHT.Transport
     ( parseDHTAddr
     , encodeDHTAddr
@@ -68,11 +70,11 @@ data DHTMessage (f :: * -> *)
     | DHTGetNodes (Asymm (f GetNodes))
     | DHTSendNodes (Asymm (f SendNodes))
     | DHTCookieRequest (Asymm (f CookieRequest))
-    | DHTCookie Nonce24 (f Cookie)
+    | DHTCookie Nonce24 (f (Cookie Encrypted))
     | DHTDHTRequest PublicKey (Asymm (f DHTRequest))
     | DHTLanDiscovery NodeId
 
-deriving instance ( Show (f Cookie)
+deriving instance ( Show (f (Cookie Encrypted))
                   , Show (Asymm (f Ping))
                   , Show (Asymm (f Pong))
                   , Show (Asymm (f GetNodes))
@@ -123,7 +125,7 @@ encodeDHTAddr :: (DHTMessage Encrypted8,NodeInfo) -> IO (ByteString, SockAddr)
 encodeDHTAddr (msg,ni) = return (runPut $ putMessage msg, nodeAddr ni)
 
 dhtMessageType :: ( Serialize (f DHTRequest)
-                  , Serialize (f Cookie), Serialize (f CookieRequest)
+                  , Serialize (f (Cookie Encrypted)), Serialize (f CookieRequest)
                   , Serialize (f SendNodes), Serialize (f GetNodes)
                   , Serialize (f Pong), Serialize (f Ping)
                   ) => DHTMessage f -> (Word8, Put)
@@ -139,7 +141,7 @@ dhtMessageType (DHTLanDiscovery nid) = (0x21, put nid)
 putMessage :: DHTMessage Encrypted8 -> Put
 putMessage msg = case dhtMessageType msg of (typ,p) -> put typ >> p
 
-getCookie :: Get (Nonce24, Encrypted8 Cookie)
+getCookie :: Get (Nonce24, Encrypted8 (Cookie Encrypted))
 getCookie = get
 
 getDHTReqest :: Get (PublicKey, Asymm (Encrypted8 DHTRequest))
@@ -354,15 +356,18 @@ instance S.Serialize Pong where
 
 newtype CookieRequest = CookieRequest PublicKey
  deriving (Eq, Show)
-newtype CookieResponse = CookieResponse Cookie
+newtype CookieResponse = CookieResponse (Cookie Encrypted)
  deriving (Eq, Show)
 
-data Cookie = Cookie Nonce24 (Encrypted CookieData)
- deriving (Eq, Ord, Show)
+data Cookie (f :: * -> *) = Cookie Nonce24 (f CookieData)
 
-instance Sized Cookie where size = ConstSize 112 -- 24 byte nonce + 88 byte cookie data
+deriving instance Eq   (f CookieData) => Eq   (Cookie f)
+deriving instance Ord  (f CookieData) => Ord  (Cookie f)
+deriving instance Show (f CookieData) => Show (Cookie f)
 
-instance Serialize Cookie where
+instance Sized (Cookie Encrypted) where size = ConstSize 112 -- 24 byte nonce + 88 byte cookie data
+
+instance Serialize (Cookie Encrypted) where
     get = Cookie <$> get <*> get
     put (Cookie nonce dta) = put nonce >> put dta