cryptocipher 0.3.6 → 0.3.7

raw patch · 3 files changed

+8/−8 lines, 3 filesdep ~test-frameworkdep ~test-framework-quickcheck2PVP ok

version bump matches the API change (PVP)

Dependency ranges changed: test-framework, test-framework-quickcheck2

API changes (from Hackage documentation)

Files

• Crypto/Cipher/AES/Haskell.hs +2/−2
• Tests/AES.hs +3/−3
• cryptocipher.cabal +3/−3

@@ -128,7 +128,7 @@ 				let r = coreEncrypt key $ B.pack $ B.zipWith xor iv' x in 				r : encryptIter r xs -{- | encrypt using simple EBC mode -}+{- | encrypt using simple ECB mode -} encrypt :: Key -> B.ByteString -> B.ByteString encrypt key b 	| B.length b `mod` 16 /= 0 = error "invalid data length"@@ -147,7 +147,7 @@ 				let r = B.pack $ B.zipWith xor iv' $ coreDecrypt key x in 				r : decryptIter x xs -{- | decrypt using simple EBC mode -}+{- | decrypt using simple ECB mode -} decrypt :: Key -> B.ByteString -> B.ByteString decrypt key b 	| B.length b `mod` 16 /= 0 = error "invalid data length"

@@ -41,14 +41,14 @@ instance Arbitrary Message where     arbitrary = choose (1,102) >>= \sz -> Message <$> arbitraryBS (16*sz) -ebcTests l (Key128 k, Message m) = (== 1) $ length $ nub $ map (\f -> f k m) l+ecbTests l (Key128 k, Message m) = (== 1) $ length $ nub $ map (\f -> f k m) l cbcTests l (IV iv, Key128 k, Message m) = (== 1) $ length $ nub $ map (\f -> f k iv m) l  unright (Right r) = r unright (Left e) = error e  aesTests =-    [ testProperty "ECB Encryption Equivalent" $ ebcTests+    [ testProperty "ECB Encryption Equivalent" $ ecbTests         [ (\k m -> AESHs.encrypt (unright $ AESHs.initKey128 k) m) #ifdef HAVE_AESNI         , (\k m -> AESNI.encrypt (AESNI.initKey128 k) m)@@ -60,7 +60,7 @@         , (\k iv m -> AESNI.encryptCBC (AESNI.initKey128 k) iv m) #endif         ]-    , testProperty "ECB Decryption Equivalent" $ ebcTests+    , testProperty "ECB Decryption Equivalent" $ ecbTests         [ (\k m -> AESHs.decrypt (unright $ AESHs.initKey128 k) m) #ifdef HAVE_AESNI         , (\k m -> AESNI.decrypt (AESNI.initKey128 k) m)

@@ -1,5 +1,5 @@ Name:                cryptocipher-Version:             0.3.6+Version:             0.3.7 Description:         Symmetrical Block, Stream and PubKey Ciphers License:             BSD3 License-file:        LICENSE@@ -62,8 +62,8 @@                    , vector                    , entropy                    , QuickCheck >= 2-                   , test-framework >= 0.3.3 && < 0.7-                   , test-framework-quickcheck2 >= 0.2.9 && < 0.3+                   , test-framework >= 0.3.3+                   , test-framework-quickcheck2 >= 0.2.9  Executable           Benchmarks   hs-source-dirs:    Benchmarks