3 files changed, 4 insertions, 8 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index 71aa99c4..0a7f07c3 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -218,7 +218,7 @@ decryptSymmetric (SymmetricKey symmkey) (Nonce24 n24) (Encrypted bs) = do
     let (ds, symm') = Symmetric.decrypt bs'' symm
         auth = Symmetric.finalize symm'
     if BA.convert auth /= mac
-        then Left "symmetricDecipher: Auth fail."
+        then Left "Symmetric decryption failed.  Incorrect key material?"
         else return $ Plain ds
 
 encryptSymmetric :: SymmetricKey -> Nonce24 -> Plain s x -> Encrypted x
@@ -237,7 +237,7 @@ data State = State Poly1305.State XSalsa.State
 decrypt :: State -> Encrypted a -> Either String (Plain s a)
 decrypt (State hash crypt) ciphertext
     | (a == mac) = Right (Plain m)
-    | otherwise  = Left "decipherAndAuth: auth fail"
+    | otherwise  = Left "Asymmetric decryption failed.  Incorrect key material?"
   where
     (mac, c) = authAndBytes ciphertext
     m = fst . XSalsa.combine crypt $ c
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 5bd23da8..634b0db1 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -490,13 +490,13 @@ forkTox tox = do
            , bootstrap (DHT.refresher6 $ toxRouting tox)
            )
 
--- TODO: Don't export this.
+-- TODO: Don't export this.  The exported interface is 'toxAnnounceToLan'.
 announceToLan :: Socket -> NodeId -> IO ()
 announceToLan sock nid = do
     addrs <- broadcastAddrs
     forM_ addrs $ \addr -> do
     (broadcast_info:_) <- getAddrInfo (Just defaultHints { addrFlags = [AI_NUMERICHOST], addrSocketType = Datagram })
-                                      (Just addr) -- TODO: Detect broadcast address.
+                                      (Just addr)
                                       (Just "33445")
     let broadcast = addrAddress broadcast_info
         bs = S.runPut $ DHT.putMessage (DHT.DHTLanDiscovery nid)
diff --git a/todo.txt b/todo.txt
index 645197d5..5483efbb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,10 +9,6 @@ ui: better error message for a +dhtkey without any selected key.
 
 tox: tcp relay
 
-bug: local IPv6 addresses are occurring in the IPv4 tox routing table.
-
-xmpp: xmpp-added roster keys are not in TransportCrypto and unusable from TOx.Crypto.Handlers.
-
 xmpp: handle tox-friends in roster.
 
 tox: Add fallback trials to cookie response in case response is from another address than request.