diff --git a/Data/CryptoHash/MD2.hs b/Data/CryptoHash/MD2.hs deleted file mode 100644 --- a/Data/CryptoHash/MD2.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.MD2 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for MD2. use Crypto.Hash.MD2 instead. --- -module Data.CryptoHash.MD2 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.MD2 (Ctx(..)) -import qualified Crypto.Hash.MD2 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.MD2" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.MD2" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.MD2" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.MD2" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.MD2" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/MD4.hs b/Data/CryptoHash/MD4.hs deleted file mode 100644 --- a/Data/CryptoHash/MD4.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.MD4 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for MD4. use Crypto.Hash.MD4 instead. --- -module Data.CryptoHash.MD4 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.MD4 (Ctx(..)) -import qualified Crypto.Hash.MD4 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.MD4" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.MD4" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.MD4" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.MD4" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.MD4" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/MD5.hs b/Data/CryptoHash/MD5.hs deleted file mode 100644 --- a/Data/CryptoHash/MD5.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.MD5 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for MD5. use Crypto.Hash.MD5 instead. --- -module Data.CryptoHash.MD5 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.MD5 (Ctx(..)) -import qualified Crypto.Hash.MD5 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.MD5" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.MD5" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.MD5" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.MD5" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.MD5" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/RIPEMD160.hs b/Data/CryptoHash/RIPEMD160.hs deleted file mode 100644 --- a/Data/CryptoHash/RIPEMD160.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.RIPEMD160 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for RIPEMD160. use Crypto.Hash.RIPEMD160 instead. --- -module Data.CryptoHash.RIPEMD160 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.RIPEMD160 (Ctx(..)) -import qualified Crypto.Hash.RIPEMD160 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.RIPEMD160" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.RIPEMD160" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.RIPEMD160" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.RIPEMD160" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.RIPEMD160" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/SHA1.hs b/Data/CryptoHash/SHA1.hs deleted file mode 100644 --- a/Data/CryptoHash/SHA1.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.SHA1 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for SHA1. use Crypto.Hash.SHA1 instead. --- -module Data.CryptoHash.SHA1 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.SHA1 (Ctx(..)) -import qualified Crypto.Hash.SHA1 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.SHA1" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.SHA1" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.SHA1" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.SHA1" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.SHA1" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/SHA224.hs b/Data/CryptoHash/SHA224.hs deleted file mode 100644 --- a/Data/CryptoHash/SHA224.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.SHA224 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for SHA224. use Crypto.Hash.SHA224 instead. --- -module Data.CryptoHash.SHA224 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.SHA224 (Ctx(..)) -import qualified Crypto.Hash.SHA224 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.SHA224" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.SHA224" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.SHA224" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.SHA224" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.SHA224" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/SHA256.hs b/Data/CryptoHash/SHA256.hs deleted file mode 100644 --- a/Data/CryptoHash/SHA256.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.SHA256 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for SHA256. use Crypto.Hash.SHA256 instead. --- -module Data.CryptoHash.SHA256 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.SHA256 (Ctx(..)) -import qualified Crypto.Hash.SHA256 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.SHA256" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.SHA256" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.SHA256" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.SHA256" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.SHA256" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/SHA384.hs b/Data/CryptoHash/SHA384.hs deleted file mode 100644 --- a/Data/CryptoHash/SHA384.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.SHA384 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for SHA384. use Crypto.Hash.SHA384 instead. --- -module Data.CryptoHash.SHA384 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.SHA384 (Ctx(..)) -import qualified Crypto.Hash.SHA384 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.SHA384" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.SHA384" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.SHA384" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.SHA384" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.SHA384" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/SHA512.hs b/Data/CryptoHash/SHA512.hs deleted file mode 100644 --- a/Data/CryptoHash/SHA512.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.SHA512 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for SHA512. use Crypto.Hash.SHA512 instead. --- -module Data.CryptoHash.SHA512 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.SHA512 (Ctx(..)) -import qualified Crypto.Hash.SHA512 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.SHA512" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.SHA512" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.SHA512" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.SHA512" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.SHA512" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/Skein256.hs b/Data/CryptoHash/Skein256.hs deleted file mode 100644 --- a/Data/CryptoHash/Skein256.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.Skein256 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for Skein256. use Crypto.Hash.Skein256 instead. --- -module Data.CryptoHash.Skein256 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Int -> Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: Int -> ByteString -> ByteString - hashlazy -- :: Int -> ByteString -> ByteString - ) where - -import Prelude (Int) -import Crypto.Hash.Skein256 (Ctx(..)) -import qualified Crypto.Hash.Skein256 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.Skein256" #-} -init :: Int -> Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.Skein256" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.Skein256" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.Skein256" #-} -hash :: Int -> ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.Skein256" #-} -hashlazy :: Int -> L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/Skein512.hs b/Data/CryptoHash/Skein512.hs deleted file mode 100644 --- a/Data/CryptoHash/Skein512.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.Skein512 --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for Skein512. use Crypto.Hash.Skein512 instead. --- -module Data.CryptoHash.Skein512 ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Int -> Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: Int -> ByteString -> ByteString - hashlazy -- :: Int -> ByteString -> ByteString - ) where - -import Prelude (Int) -import Crypto.Hash.Skein512 (Ctx(..)) -import qualified Crypto.Hash.Skein512 as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.Skein512" #-} -init :: Int -> Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.Skein512" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.Skein512" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.Skein512" #-} -hash :: Int -> ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.Skein512" #-} -hashlazy :: Int -> L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/Data/CryptoHash/Tiger.hs b/Data/CryptoHash/Tiger.hs deleted file mode 100644 --- a/Data/CryptoHash/Tiger.hs +++ /dev/null @@ -1,47 +0,0 @@ --- | --- Module : Data.CryptoHash.Tiger --- License : BSD-style --- Maintainer : Vincent Hanquez --- Stability : experimental --- Portability : unknown --- --- compatibility module for Tiger. use Crypto.Hash.Tiger instead. --- -module Data.CryptoHash.Tiger ( - Ctx(..), - - -- * Incremental hashing Functions - init, -- :: Ctx - update, -- :: Ctx -> ByteString -> Ctx - finalize, -- :: Ctx -> ByteString - - -- * Single Pass hashing - hash, -- :: ByteString -> ByteString - hashlazy -- :: ByteString -> ByteString - ) where - -import Prelude () -import Crypto.Hash.Tiger (Ctx(..)) -import qualified Crypto.Hash.Tiger as R -import Data.ByteString (ByteString) -import qualified Data.ByteString.Lazy as L (ByteString) - -{-# DEPRECATED init "use crypto.hash.Tiger" #-} -init :: Ctx -init = R.init - -{-# DEPRECATED update "use crypto.hash.Tiger" #-} -update :: Ctx -> ByteString -> Ctx -update = R.update - -{-# DEPRECATED finalize "use crypto.hash.Tiger" #-} -finalize :: Ctx -> ByteString -finalize = R.finalize - -{-# DEPRECATED hash "use crypto.hash.Tiger" #-} -hash :: ByteString -> ByteString -hash = R.hash - -{-# DEPRECATED hashlazy "use crypto.hash.Tiger" #-} -hashlazy :: L.ByteString -> ByteString -hashlazy = R.hashlazy diff --git a/cryptohash.cabal b/cryptohash.cabal --- a/cryptohash.cabal +++ b/cryptohash.cabal @@ -1,5 +1,5 @@ Name: cryptohash -Version: 0.6.3 +Version: 0.7.0 Description: A collection of crypto hashes, with a practical incremental and one-pass, pure APIs, with performance close to the fastest implementations available in others languages. @@ -35,7 +35,7 @@ Library Build-Depends: base >= 4 && < 6, bytestring if flag(cryptoapi) - Build-depends: crypto-api >= 0.1, tagged >= 0.1, cereal >= 0.2 + Build-depends: crypto-api >= 0.5, tagged >= 0.1, cereal >= 0.2 cpp-options: -DHAVE_CRYPTOAPI Extensions: ForeignFunctionInterface Exposed-modules: Crypto.Hash.SHA1 @@ -51,18 +51,6 @@ Crypto.Hash.Skein256 Crypto.Hash.Skein512 Crypto.Hash.Tiger - Data.CryptoHash.SHA1 - Data.CryptoHash.SHA224 - Data.CryptoHash.SHA256 - Data.CryptoHash.SHA384 - Data.CryptoHash.SHA512 - Data.CryptoHash.MD2 - Data.CryptoHash.MD4 - Data.CryptoHash.MD5 - Data.CryptoHash.RIPEMD160 - Data.CryptoHash.Skein256 - Data.CryptoHash.Skein512 - Data.CryptoHash.Tiger ghc-options: -Wall -O2 -optc-O3 -fno-cse C-sources: cbits/sha1.c cbits/sha256.c @@ -78,7 +66,7 @@ Executable Tests Main-Is: Tests.hs - Extensions: ForeignFunctionInterface, CPP + Extensions: ForeignFunctionInterface C-sources: cbits/sha1.c cbits/sha256.c cbits/sha512.c @@ -95,7 +83,7 @@ else Buildable: False if flag(cryptoapi) - Build-depends: crypto-api >= 0.1, tagged >= 0.1, cereal >= 0.2 + Build-depends: crypto-api >= 0.5, tagged >= 0.1, cereal >= 0.2 cpp-options: -DHAVE_CRYPTOAPI source-repository head