3 files changed, 25 insertions, 14 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 987f742c..eb4c6027 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -208,7 +208,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
 data Tox = Tox
     { toxDHT :: DHT.Client
     , toxOnion :: Onion.Client RouteId
-    , toxToRoute :: Transport String Onion.Rendezvous (Asymm (Encrypted Onion.DataToRoute))
+    , toxToRoute :: Transport String Onion.Rendezvous Onion.DataToRoute
     , toxCrypto :: Transport String SockAddr NetCrypto
     , toxCryptoKeys :: TransportCrypto
     , toxRouting :: DHT.Routing
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index bdaef651..4c3de3e6 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -738,16 +738,27 @@ instance Show Rendezvous where
 parseDataToRoute
     :: TransportCrypto
          -> (OnionMessage Encrypted,OnionDestination r)
-         -> Either (Asymm (Encrypted DataToRoute),Rendezvous) (OnionMessage Encrypted, OnionDestination r)
-parseDataToRoute crypto (OnionToRouteResponse dta, od)
-                            = Left ( dta
-                                   , Rendezvous (rendezvousAliasPublic crypto) $ onionNodeInfo od )
-parseDataToRoute _      msg = Right msg
+         -> IO (Either (DataToRoute,Rendezvous) (OnionMessage Encrypted, OnionDestination r))
+parseDataToRoute crypto (OnionToRouteResponse dta, od) =
+    return $ either (const $ Right (OnionToRouteResponse dta,od)) Left $ do
+        -- XXX: Do something with decryption failure?
+        decrypted <- uncomposed
+             $ decryptMessage (rendezvousSecret crypto,rendezvousPublic crypto)
+                              (asymmNonce dta)
+                              (Right dta)
+        return ( runIdentity decrypted
+               , Rendezvous (rendezvousPublic crypto) $ onionNodeInfo od )
+parseDataToRoute _ msg = return $ Right msg
 
 encodeDataToRoute :: TransportCrypto
-                     -> (Asymm (Encrypted DataToRoute),Rendezvous)
-                     -> Maybe (OnionMessage Encrypted,OnionDestination r)
-encodeDataToRoute crypto (dta, Rendezvous pub ni)
-    = Just ( OnionToRoute pub -- Public key of destination node
-                          dta
-           , OnionDestination SearchingAlias ni Nothing )
+                     -> (DataToRoute,Rendezvous)
+                     -> IO (Maybe (OnionMessage Encrypted,OnionDestination r))
+encodeDataToRoute crypto (plain, Rendezvous pub ni) = do
+    nonce <- atomically $ transportNewNonce crypto
+    let dta = encryptMessage (onionAliasSecret crypto) pub nonce plain
+    return $ Just ( OnionToRoute pub -- Public key of destination node
+                                 Asymm { senderKey  = onionAliasPublic crypto
+                                       , asymmNonce = nonce
+                                       , asymmData  = dta
+                                       }
+                  , OnionDestination SearchingAlias ni Nothing )
diff --git a/src/Network/Tox/Transport.hs b/src/Network/Tox/Transport.hs
index 59c0cf6f..2a4e7eee 100644
--- a/src/Network/Tox/Transport.hs
+++ b/src/Network/Tox/Transport.hs
@@ -24,14 +24,14 @@ toxTransport ::
           -> UDPTransport
           -> IO ( Transport String NodeInfo (DHTMessage Encrypted8)
                 , Transport String (OnionDestination RouteId) (OnionMessage Encrypted)
-                , Transport String Rendezvous (Asymm (Encrypted DataToRoute))
+                , Transport String Rendezvous DataToRoute
                 , Transport String SockAddr NetCrypto )
 toxTransport crypto orouter closeLookup udp = do
     (dht,udp1) <- partitionTransport parseDHTAddr (Just . encodeDHTAddr) $ forwardOnions crypto udp
     (onion1,udp2) <- partitionTransportM (parseOnionAddr $ lookupSender orouter)
                                         (encodeOnionAddr $ lookupRoute orouter)
                                         udp1
-    (dta,onion) <- partitionTransport (parseDataToRoute crypto) (encodeDataToRoute crypto) onion1
+    (dta,onion) <- partitionTransportM (parseDataToRoute crypto) (encodeDataToRoute crypto) onion1
     let netcrypto = layerTransport parseNetCrypto encodeNetCrypto udp2
     return ( forwardDHTRequests crypto closeLookup dht
            , onion