parseNetCrypto should peel id byte before deserializing the rest of the message.

2 files changed, 3 insertions, 2 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 141ef792..1444ffca 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -81,8 +81,8 @@ data NetCrypto
     | NetCrypto (CryptoPacket Encrypted)
 
 parseNetCrypto :: ByteString -> SockAddr -> Either String (NetCrypto, SockAddr)
-parseNetCrypto pkt@(B.uncons -> Just (0x1a,_)) saddr = left ("parseNetCrypto: "++) $ (,saddr) . NetHandshake <$> runGet get pkt
-parseNetCrypto pkt@(B.uncons -> Just (0x1b,_)) saddr = left ("parseNetCrypto: "++) $ (,saddr) . NetCrypto    <$> runGet get pkt
+parseNetCrypto (B.uncons -> Just (0x1a,pkt)) saddr = left ("parseNetCrypto: "++) $ (,saddr) . NetHandshake <$> runGet get pkt
+parseNetCrypto (B.uncons -> Just (0x1b,pkt)) saddr = left ("parseNetCrypto: "++) $ (,saddr) . NetCrypto    <$> runGet get pkt
 parseNetCrypto _ _ = Left "parseNetCrypto: ?"
 
 encodeNetCrypto :: NetCrypto -> SockAddr -> (ByteString, SockAddr)
diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index f7feea3b..59b22673 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -371,6 +371,7 @@ data CookieData = CookieData   --   16 (mac)
     , longTermKey :: PublicKey --   32
     , dhtKey      :: PublicKey -- + 32
     }                          -- = 88 bytes when encrypted.
+ deriving Show
 
 instance Sized CookieData where
     size = ConstSize 72