From f686733fc63663e9c6fba15e1441a87d001a7bbf Mon Sep 17 00:00:00 2001
From: Vincent Hanquez <vincent@snarc.org>
Date: Sat, 18 Apr 2015 06:55:17 +0100
Subject: [PATCH] [Blowfish] Stop using ecb{Encrypt,Decrypt}Legacy stop gap
 call.

---
 Crypto/Cipher/Blowfish.hs    |  4 ++--
 Crypto/Cipher/Types.hs       |  2 --
 Crypto/Cipher/Types/Block.hs | 14 --------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Crypto/Cipher/Blowfish.hs b/Crypto/Cipher/Blowfish.hs
index 2627d0c..23478db 100644
--- a/Crypto/Cipher/Blowfish.hs
+++ b/Crypto/Cipher/Blowfish.hs
@@ -50,8 +50,8 @@ instance Cipher CSTR where \
     }; \
 instance BlockCipher CSTR where \
     { blockSize _ = 8 \
-    ; ecbEncrypt (CSTR bf) = ecbEncryptLegacy encrypt bf \
-    ; ecbDecrypt (CSTR bf) = ecbDecryptLegacy decrypt bf \
+    ; ecbEncrypt (CSTR bf) = encrypt bf \
+    ; ecbDecrypt (CSTR bf) = decrypt bf \
     };
 
 INSTANCE_CIPHER(Blowfish64, "blowfish64", 8)
diff --git a/Crypto/Cipher/Types.hs b/Crypto/Cipher/Types.hs
index 5e73395..7486b06 100644
--- a/Crypto/Cipher/Types.hs
+++ b/Crypto/Cipher/Types.hs
@@ -14,8 +14,6 @@ module Crypto.Cipher.Types
       Cipher(..)
     , BlockCipher(..)
     , BlockCipher128(..)
-    , ecbEncryptLegacy
-    , ecbDecryptLegacy
     , StreamCipher(..)
     , DataUnitOffset
     , KeySizeSpecifier(..)
diff --git a/Crypto/Cipher/Types/Block.hs b/Crypto/Cipher/Types/Block.hs
index 8870249..8a8f060 100644
--- a/Crypto/Cipher/Types/Block.hs
+++ b/Crypto/Cipher/Types/Block.hs
@@ -15,8 +15,6 @@ module Crypto.Cipher.Types.Block
     -- * BlockCipher
       BlockCipher(..)
     , BlockCipher128(..)
-    , ecbEncryptLegacy
-    , ecbDecryptLegacy
     -- * initialization vector (IV)
     , IV(..)
     , makeIV
@@ -115,18 +113,6 @@ class Cipher cipher => BlockCipher cipher where
     aeadInit :: Byteable iv => AEADMode -> cipher -> iv -> Maybe (AEAD cipher)
     aeadInit _ _ _ = Nothing
 
-ecbEncryptLegacy :: ByteArray ba
-                 => (cipher -> ByteString -> ByteString)
-                 -> cipher -> ba -> ba
-ecbEncryptLegacy f cipher input =
-    byteArrayFromBS $ f cipher (byteArrayToBS input)
-
-ecbDecryptLegacy :: ByteArray ba
-                 => (cipher -> ByteString -> ByteString)
-                 -> cipher -> ba -> ba
-ecbDecryptLegacy f cipher input =
-    byteArrayFromBS $ f cipher (byteArrayToBS input)
-
 -- | class of block cipher with a 128 bits block size
 class BlockCipher cipher => BlockCipher128 cipher where
     -- | encrypt using the XTS mode.