Serialize instance for Handshake.

2 files changed, 12 insertions, 0 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 0011fac0..4cf6c7a5 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -39,6 +39,7 @@ module Network.Tox.Crypto.Transport
 
 import Crypto.Tox
 import Network.Tox.DHT.Transport (Cookie)
+import Network.Tox.NodeId
 
 import Network.Socket
 import Data.ByteString as B
@@ -67,6 +68,10 @@ data Handshake (f :: * -> *) = Handshake
     , hadshakeData :: f HandshakeData
     }
 
+instance Serialize (Handshake Encrypted) where
+    get = Handshake <$> get <*> get <*> get
+    put (Handshake cookie n24 dta) = put cookie >> put n24 >> put dta
+
 data HandshakeData = HandshakeData
     { baseNonce :: Nonce24
     , sessionKey :: PublicKey
@@ -74,6 +79,12 @@ data HandshakeData = HandshakeData
     , otherCookie :: Cookie
     }
 
+instance Sized HandshakeData where
+    size = contramap baseNonce size
+            <> contramap (key2id . sessionKey) size
+            <> ConstSize 64 -- contramap cookieHash size -- missing instance Sized (Digest SHA512)
+            <> contramap otherCookie size
+
 data CryptoPacket (f :: * -> *) = CryptoPacket
     { pktNonce :: Word16
     , pktData :: f CryptoData
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 20dc1854..00b572f2 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -90,6 +90,7 @@ packPublicKey ws = BA.allocAndFreeze (8 * length ws) $
 newtype NodeId = NodeId [Word64]
  deriving (Eq,Ord) -- ByteArrayAccess) -- (Eq,Ord,ByteArrayAccess, Bits, Hashable)
 
+instance Sized NodeId where size = ConstSize 32
 
 key2id :: PublicKey -> NodeId
 key2id = NodeId . unpackPublicKey