cryptohash-md5 0.11.7.2 → 0.11.100.0

raw patch · 5 files changed

+117/−11 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• cbits/md5.c +2/−1
• changelog.md +5/−0
• cryptohash-md5.cabal +3/−1
• src-tests/test-md5.hs +61/−8
• src/Crypto/Hash/MD5.hs +46/−1

@@ -202,11 +202,12 @@ void hs_cryptohash_md5_update(struct md5_ctx *ctx, const uint8_t *data, size_t len) {-  size_t index   = ctx->sz & 0x3f;+  size_t index = ctx->sz & 0x3f;   const size_t to_fill = 64 - index;    ctx->sz += len; +  /* process partial buffer if there's enough data to make a block */   if (index && len >= to_fill) {     memcpy(ctx->buf + index, data, to_fill);     md5_do_chunk(ctx, ctx->buf);

@@ -1,3 +1,8 @@+## 0.11.100.0++ - new `hmac` and `hmaclazy` functions providing HMAC-MD5+   computation conforming to RFC2104 and RFC2202+ ## 0.11.7.2   - switch to 'safe' FFI for calls where overhead becomes neglible

@@ -1,8 +1,9 @@ name:                cryptohash-md5-version:             0.11.7.2+version:             0.11.100.0 description:     A practical incremental and one-pass, pure API to the     <https://en.wikipedia.org/wiki/MD5 MD5 hash algorithm>+    (including <https://en.wikipedia.org/wiki/HMAC HMAC> support)     with performance close to the fastest implementations available in other languages.     .     The implementation is made in C with a haskell FFI wrapper that hides the C implementation.@@ -52,6 +53,7 @@  test-suite test-md5   default-language:  Haskell2010+  other-extensions:  OverloadedStrings   type:              exitcode-stdio-1.0   hs-source-dirs:    src-tests   main-is:           test-md5.hs

@@ -2,6 +2,7 @@  module Main (main) where +import           Data.Bits              (xor) import           Data.ByteString        (ByteString) import qualified Data.ByteString        as B import qualified Data.ByteString.Lazy   as BL@@ -90,13 +91,39 @@       where         vecXL = BL.fromChunks (replicate 16777216 "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmno") -    splitB :: Int -> ByteString -> [ByteString]-    splitB l b-      | B.length b > l = b1 : splitB l b2-      | otherwise = [b]+splitB :: Int -> ByteString -> [ByteString]+splitB l b+  | B.length b > l = b1 : splitB l b2+  | otherwise = [b]+  where+    (b1, b2) = B.splitAt l b+++rfc2202Vectors :: [(ByteString,ByteString,ByteString)]+rfc2202Vectors = -- (secrect,msg,mac)+    [ (rep 16 0x0b, "Hi There", x"9294727a3638bb1c13f48ef8158bfc9d")+    , ("Jefe", "what do ya want for nothing?", x"750c783e6ab0b503eaa86e310a5db738")+    , (rep 16 0xaa, rep 50 0xdd, x"56be34521d144c88dbb8c733f0e8b3f6")+    , (B.pack [1..25], rep 50 0xcd, x"697eaf0aca3a3aea3a75164746ffaa79")+    , (rep 16 0x0c, "Test With Truncation", x"56461ef2342edc00f9bab995690efd4c")+    , (rep 80 0xaa, "Test Using Larger Than Block-Size Key - Hash Key First", x"6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd")+    , (rep 80 0xaa, "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", x"6f630fad67cda0ee1fb1f562db3aa53e")+    ]+  where+    x = fst.B16.decode+    rep n c = B.replicate n c++rfc2202Tests :: [TestTree]+rfc2202Tests = zipWith makeTest [1::Int ..] rfc2202Vectors+  where+    makeTest i (key, msg, mac) = testGroup ("vec"++show i) $+        [ testCase "hmac" (hex mac  @=? hex (IUT.hmac key msg))+        , testCase "hmaclazy" (hex mac  @=? hex (IUT.hmaclazy key lazymsg))+        ]       where-        (b1, b2) = B.splitAt l b+        lazymsg = BL.fromChunks . splitB 1 $ msg +    hex = B16.encode  -- define own 'foldl' here to avoid RULE rewriting to 'hashlazy' myfoldl' :: (b -> a -> b) -> b -> [a] -> b@@ -128,6 +155,8 @@ refImplTests =     [ testProperty "hash" prop_hash     , testProperty "hashlazy" prop_hashlazy+    , testProperty "hmac" prop_hmac+    , testProperty "hmaclazy" prop_hmaclazy     ]   where     prop_hash (RandBS bs)@@ -136,19 +165,43 @@     prop_hashlazy (RandLBS bs)         = ref_hashlazy bs == IUT.hashlazy bs +    prop_hmac (RandBS k) (RandBS bs)+        = ref_hmac k bs == IUT.hmac k bs++    prop_hmaclazy (RandBS k) (RandLBS bs)+        = ref_hmaclazy k bs == IUT.hmaclazy k bs+     ref_hash :: ByteString -> ByteString-    ref_hash = REF.md5DigestBytes . REF.md5 . fromStrict+    ref_hash = ref_hashlazy . fromStrict      ref_hashlazy :: BL.ByteString -> ByteString     ref_hashlazy = REF.md5DigestBytes . REF.md5 -    -- toStrict/fromStrict only available with bytestring-0.10 and later-    fromStrict = BL.fromChunks . (:[])+    -- stolen & adapted from SHA package+    ref_hmac :: ByteString -> ByteString -> ByteString+    ref_hmac k m = ref_hash (B.append opad (ref_hash (B.append ipad m)))+     where+      opad = B.map (xor 0x5c) k'+      ipad = B.map (xor 0x36) k' +      k' = B.append kt pad+       where+        kt  = if kn > bn then ref_hash k else k+        pad = B.replicate (bn - ktn) 0+        kn  = B.length k+        ktn = B.length kt+        bn  = 64 +    ref_hmaclazy :: ByteString -> BL.ByteString -> ByteString+    ref_hmaclazy secret = ref_hmac secret . toStrict +    -- toStrict/fromStrict only available with bytestring-0.10 and later+    toStrict = B.concat . BL.toChunks+    fromStrict = BL.fromChunks . (:[])+ main :: IO () main = defaultMain $ testGroup "cryptohash-md5"     [ testGroup "KATs" katTests+    , testGroup "RFC2202" rfc2202Tests     , testGroup "REF" refImplTests     ]

@@ -63,7 +63,15 @@     -- package is recommended.      , hash     -- :: ByteString -> ByteString-    , hashlazy -- :: ByteString -> ByteString+    , hashlazy -- :: L.ByteString -> ByteString++    -- ** HMAC-MD5+    --+    -- | <https://tools.ietf.org/html/rfc2104 RFC2104>-compatible+    -- <https://en.wikipedia.org/wiki/HMAC HMAC>-MD5 digests++    , hmac     -- :: ByteString -> ByteString -> ByteString+    , hmaclazy -- :: ByteString -> L.ByteString -> ByteString     ) where  import Prelude hiding (init)@@ -76,6 +84,7 @@ import Data.ByteString (ByteString) import Data.ByteString.Unsafe (unsafeUseAsCStringLen) import Data.ByteString.Internal (create, toForeignPtr, memcpy)+import Data.Bits (xor) import Data.Word import System.IO.Unsafe (unsafeDupablePerformIO) @@ -213,3 +222,39 @@ hashlazy :: L.ByteString -> ByteString hashlazy l = unsafeDoIO $ withCtxNewThrow $ \ptr -> do     c_md5_init ptr >> mapM_ (updateInternalIO ptr) (L.toChunks l) >> finalizeInternalIO ptr+++{-# NOINLINE hmac #-}+-- | Compute 16-byte <https://tools.ietf.org/html/rfc2104 RFC2104>-compatible+-- HMAC-Md5 digest for a strict bytestring message+--+-- @since 0.11.100.0+hmac :: ByteString -- ^ secret+     -> ByteString -- ^ message+     -> ByteString+hmac secret msg = hash $ B.append opad (hash $ B.append ipad msg)+  where+    opad = B.map (xor 0x5c) k'+    ipad = B.map (xor 0x36) k'++    k'  = B.append kt pad+    kt  = if B.length secret > 64 then hash secret else secret+    pad = B.replicate (64 - B.length kt) 0+++{-# NOINLINE hmaclazy #-}+-- | Compute 16-byte <https://tools.ietf.org/html/rfc2104 RFC2104>-compatible+-- HMAC-MD5 digest for a lazy bytestring message+--+-- @since 0.11.100.0+hmaclazy :: ByteString   -- ^ secret+         -> L.ByteString -- ^ message+         -> ByteString+hmaclazy secret msg = hash $ B.append opad (hashlazy $ L.append ipad msg)+  where+    opad = B.map (xor 0x5c) k'+    ipad = L.fromChunks [B.map (xor 0x36) k']++    k'  = B.append kt pad+    kt  = if B.length secret > 64 then hash secret else secret+    pad = B.replicate (64 - B.length kt) 0