From bc8c61dd7933f1cacd91282c0476f7bc46795daf Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Sat, 2 Jun 2018 04:08:54 -0400
Subject: Change Cookie -> Cookie Encrypted

---
 src/Network/Tox/DHT/Handlers.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/Network/Tox/DHT/Handlers.hs')

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
-- 
cgit v1.2.3