1 files changed, 14 insertions, 0 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index d6f63f18..b86a5395 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -49,6 +49,7 @@ module Crypto.Tox
     ) where
 
 import Control.Arrow
+import Control.Monad
 import qualified Crypto.Cipher.ChaChaPoly1305 as Symmetric
 import qualified Crypto.Cipher.Salsa    as Salsa
 import qualified Crypto.Cipher.XSalsa   as XSalsa
@@ -260,6 +261,7 @@ bin2hex = C8.unpack . Base16.encode . BA.convert
 bin2base64 :: ByteArrayAccess bs => bs -> String
 bin2base64 = C8.unpack . Base64.encode . BA.convert
 
+
 instance Show Nonce24 where
     showsPrec d nonce = quoted (mappend $ bin2hex nonce)
 
@@ -298,6 +300,16 @@ newtype Nonce32 = Nonce32 ByteString
 instance Show Nonce32 where
     showsPrec d nonce = mappend $ bin2base64 nonce
 
+instance Read Nonce32 where
+    readsPrec _ str = either (const []) id $ do
+        let (ds,ss) = Prelude.splitAt 43 str
+        ss' <- case ss of
+                '=':xs -> Right xs -- optional terminating '='
+                _      -> Right ss
+        bs <- Base64.decode (C8.pack $ ds ++ ['='])
+        guard $ B.length bs == 32
+        return [ (Nonce32 bs, ss') ]
+
 instance Serialize Nonce32 where
     get = Nonce32 <$> getBytes 32
     put (Nonce32 bs) = putByteString bs
@@ -350,6 +362,8 @@ data TransportCrypto = TransportCrypto
     , transportPublic :: PublicKey
     , onionAliasSecret :: SecretKey
     , onionAliasPublic :: PublicKey
+    , rendezvousSecret :: SecretKey
+    , rendezvousPublic :: PublicKey
     , transportSymmetric :: STM SymmetricKey
     , transportNewNonce :: STM Nonce24
     }