2 files changed, 15 insertions, 4 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index 8bb822d8..9b7e82c0 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -594,12 +594,13 @@ decodeSecret k64 = do
         CryptoPassed x -> Just x
         _              -> Nothing
 
+-- Treats byte pairs as big-endian.
 xorsum :: ByteArrayAccess ba => ba -> Word16
 xorsum bs = unsafeDupablePerformIO $ BA.withByteArray bs $ \ptr16 -> do
     let (wcnt,r) = BA.length bs `divMod` 2
         loop cnt !ac = do
             ac' <- xor ac <$> peekElemOff ptr16 cnt
-            case cnt of 0 -> return ac'
+            case cnt of 0 -> return $ fromBE16 ac'
                         _ -> loop (cnt - 1) ac'
     loop (wcnt - 1) $ case r of
         0 -> 0
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index b12487a4..2f3a2bb1 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -493,6 +493,7 @@ instance OnionPacket 3 where mkOnion = OnionResponse3
 data NoSpam = NoSpam !Word32 !(Maybe Word16)
  deriving (Eq,Ord,Show)
 
+-- Utilizes Data.Serialize format for Word32 nospam and Word16 checksum.
 instance Read NoSpam where
     readsPrec d s = case break isSpace s of
         ('$':ws    ,rs) | (length ws == 8)  -> base64decode rs (NoSpam <$> get <*> (Just <$> get)) ws
@@ -535,16 +536,25 @@ instance Read NoSpamId where
         nsid <- parseNoSpamId $ Text.pack jid
         return [(nsid,xs)]
 
+parseNoSpamHex hex = Right $ NoSpamId (read $ "0x"++nospamsum) (id2key $ read hkey)
+ where
+    (hkey,nospamsum) = splitAt 64 $ Text.unpack hex
+
 parseNoSpamId :: Text -> Either String NoSpamId
-parseNoSpamId jid = do
+parseNoSpamId spec | Text.length spec == 76
+                   , Text.all isHexDigit spec = parseNoSpamHex spec
+                   | otherwise                = parseNoSpamJID spec
+
+parseNoSpamJID :: Text -> Either String NoSpamId
+parseNoSpamJID jid = do
     (Just u,h,_) <- Right $ splitJID jid
     (base64,".tox") <- Right $ splitAt 43 $ Text.unpack h
     pub <- id2key <$> readEither base64
     let ustr = Text.unpack u
     '$' : b64digits <- Right ustr -- TODO: support 0x prefix also.
     NoSpam nospam (Just x) <- readEither $ map (\case; '?' -> '0'; c -> c) ustr
-    let nlo = fromIntegral nospam :: Word16
-        nhi = fromIntegral (nospam `shiftR` 16) :: Word16
+    let nlo = fromIntegral (0x0FFFF .&. nospam) :: Word16
+        nhi = fromIntegral (0x0FFFF .&. (nospam `shiftR` 16)) :: Word16
         sum = x `xor` nlo `xor` nhi `xor` xorsum pub
         -- Find any question mark indices.
         qs  = catMaybes $ zipWith (\case; '?' -> Just ; _ -> const Nothing) b64digits [0..7]