k command

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index b84e5df6..d6f63f18 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -13,6 +13,7 @@ module Crypto.Tox
     , getPublicKey
     , putPublicKey
     , SecretKey
+    , generateSecretKey
     , toPublic
     , SymmetricKey(..)
     , TransportCrypto(..)
@@ -359,7 +360,7 @@ getPublicKey = throwCryptoError . publicKey <$> S.getBytes 32
 putPublicKey :: PublicKey -> S.Put
 putPublicKey bs = S.putByteString $ BA.convert bs
 
-encodeSecret :: BA.ByteArrayAccess bin => bin -> Maybe C8.ByteString
+encodeSecret :: SecretKey -> Maybe C8.ByteString
 encodeSecret k = do
     (a,bs) <- BA.uncons (BA.convert k)
     (cs,c) <- unsnoc bs
@@ -369,7 +370,7 @@ encodeSecret k = do
         (ys,ds) = BA.splitAt 40 xs
     return $ BA.index ds 0 `BA.cons` ys `BA.snoc` BA.index ds 1
 
-decodeSecret :: C8.ByteString -> Maybe C8.ByteString
+decodeSecret :: C8.ByteString -> Maybe SecretKey
 decodeSecret k64 = do
     (ds0,ysds1) <- BA.uncons k64
     (ys,ds1) <- unsnoc ysds1
@@ -379,4 +380,7 @@ decodeSecret k64 = do
     (cs,a') <- unsnoc csa
     let a = shiftL (a' .&. 0x7c) 1
         c = shiftR c' 4 .|. (shiftL a' 4 .&. 0x30) .|. 0x40
-    return $ a `BA.cons` (cs `BA.snoc` c)
+    let r = a `BA.cons` (cs `BA.snoc` c)
+    case secretKey r of
+        CryptoPassed x -> Just x
+        _ -> Nothing