diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2015-11-08 19:21:25 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2015-11-08 19:21:25 +0300 |
commit | c8855ad522aaffbba0c7552abbf06cf0dd0527be (patch) | |
tree | c597d4a3c24a88a965a0447209572ba1ab529663 /src/Web/ZeroBin | |
parent | 44cc38c856968e6b2d619540591863ae13de9bf0 (diff) | |
download | zerobin-c8855ad522aaffbba0c7552abbf06cf0dd0527be.tar.gz |
Added documentation
Diffstat (limited to 'src/Web/ZeroBin')
-rw-r--r-- | src/Web/ZeroBin/SJCL.hs | 26 | ||||
-rw-r--r-- | src/Web/ZeroBin/Utils.hs | 13 |
2 files changed, 30 insertions, 9 deletions
diff --git a/src/Web/ZeroBin/SJCL.hs b/src/Web/ZeroBin/SJCL.hs index faa2db0..60e8737 100644 --- a/src/Web/ZeroBin/SJCL.hs +++ b/src/Web/ZeroBin/SJCL.hs @@ -1,3 +1,12 @@ +{-| +Encryption compatible with <https://crypto.stanford.edu/sjcl/ SJCL> + + >>> import Web.ZeroBin.SJCL + >>> import Data.ByteString.Char8 + >>> encrypt "secret-word" (pack "hello") +Content {iv = "VxyuJRVtKJqhG2iR/sPjAQ", salt = "AhnDuP1CkTCBlQTHgw", ct = "cqr7/pMRXrcROmcgwA"} +-} + {-# LANGUAGE DeriveGeneric #-} module Web.ZeroBin.SJCL ( @@ -23,10 +32,11 @@ import qualified Data.ByteArray as BA import qualified Data.ByteString as BS import qualified Data.ByteString.Char8 as C +-- | Encrypted content. Each field is a 'toWeb'-encoded byte-string data Content = Content { - iv :: String - , salt :: String - , ct :: String + iv :: String -- ^ random initialization vector (IV) + , salt :: String -- ^ random salt + , ct :: String -- ^ encrypted data } deriving (Generic, Show) -- FIXME: http://stackoverflow.com/questions/33045350/unexpected-haskell-aeson-warning-no-explicit-implementation-for-tojson @@ -53,9 +63,13 @@ chunks sz = split lengthOf :: Int -> Word8 lengthOf = ceiling . (logBase 256 :: Float -> Float) . fromIntegral --- Ref. https://tools.ietf.org/html/rfc3610 --- SJCL uses 64-bit tag (8 bytes) -encrypt :: String -> ByteString -> IO Content +-- | <https://crypto.stanford.edu/sjcl/ SJCL>-compatible encryption function. +-- Follows <https://tools.ietf.org/html/rfc3610 RFC3610> with a 8-bytes tag. +-- Uses 16-bytes cipher key generated from the password and a random 'salt' +-- by PBKDF2-HMAC-SHA256 with 1000 iterations. +encrypt :: String -- ^ the password + -> ByteString -- ^ the plain data to encrypt + -> IO Content encrypt password plaintext = do ivd <- getEntropy 16 -- XXX it is truncated to get the nonce below slt <- getEntropy 13 -- arbitrary length diff --git a/src/Web/ZeroBin/Utils.hs b/src/Web/ZeroBin/Utils.hs index 8f29ec4..559d9ec 100644 --- a/src/Web/ZeroBin/Utils.hs +++ b/src/Web/ZeroBin/Utils.hs @@ -1,3 +1,7 @@ +{-| +Various utility functions +-} + module Web.ZeroBin.Utils ( toWeb , makePassword @@ -8,10 +12,13 @@ import Data.ByteString (ByteString) import Data.ByteString.Base64 (encode) import Data.ByteString.Char8 (unpack) - -toWeb :: ByteString -> String +-- | Encodes to base64 and drops padding '='. +toWeb :: ByteString -- ^ the data to encode + -> String -- ^ base64 string without padding toWeb = takeWhile (/= '=') . unpack . encode -makePassword :: Int -> IO String +-- | Makes a random password +makePassword :: Int -- ^ the number of bytes of entropy + -> IO String -- ^ random byte-string encoded by 'toWeb' makePassword n = toWeb `fmap` getEntropy n |