diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-04 13:41:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-04 13:41:26 -0400 |
| commit | bc4016065f00af1b77c6fa1dedb5c4c22158b9d8 (patch) | |
| tree | 18d9f2605a982a1eafc515b807defa76a70b2ad4 /Utility/Hash.hs | |
| parent | 30d3a45c5ad9601d538e936fe3dbe19c54465ff5 (diff) | |
Remove support for building without cryptohash.
This will prevent backporting to wheezy, but it's time to simplify the
code.
Diffstat (limited to 'Utility/Hash.hs')
| -rw-r--r-- | Utility/Hash.hs | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Utility/Hash.hs b/Utility/Hash.hs index 1c5450a9b..acc8a3815 100644 --- a/Utility/Hash.hs +++ b/Utility/Hash.hs @@ -1,8 +1,4 @@ -{- Convenience wrapper around cryptohash. - - Falls back to SHA if it's not available. - -} - -{-# LANGUAGE CPP #-} +{- Convenience wrapper around cryptohash. -} module Utility.Hash ( sha1, @@ -10,10 +6,8 @@ module Utility.Hash ( sha256, sha384, sha512, -#ifdef WITH_CRYPTOHASH skein256, skein512, -#endif prop_hashes_stable ) where @@ -21,9 +15,6 @@ import qualified Data.ByteString.Lazy as L import qualified Data.Text as T import qualified Data.Text.Encoding as T -#ifndef WITH_CRYPTOHASH -import Data.Digest.Pure.SHA -#else import Crypto.Hash sha1 :: L.ByteString -> Digest SHA1 @@ -51,8 +42,6 @@ skein256 = hashlazy skein512 :: L.ByteString -> Digest Skein512_512 skein512 = hashlazy -#endif - {- Check that all the hashes continue to hash the same. -} prop_hashes_stable :: Bool prop_hashes_stable = all (\(hasher, result) -> hasher foo == result) @@ -61,10 +50,8 @@ prop_hashes_stable = all (\(hasher, result) -> hasher foo == result) , (show . sha256, "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae") , (show . sha384, "98c11ffdfdd540676b1a137cb1a22b2a70350c9a44171d6b1180c6be5cbb2ee3f79d532c8a1dd9ef2e8e08e752a3babb") , (show . sha512, "f7fbba6e0636f890e56fbbf3283e524c6fa3204ae298382d624741d0dc6638326e282c41be5e4254d8820772c5518a2c5a8c0c7f7eda19594a7eb539453e1ed7") -#ifdef WITH_CRYPTOHASH , (show . skein256, "a04efd9a0aeed6ede40fe5ce0d9361ae7b7d88b524aa19917b9315f1ecf00d33") , (show . skein512, "fd8956898113510180aa4658e6c0ac85bd74fb47f4a4ba264a6b705d7a8e8526756e75aecda12cff4f1aca1a4c2830fbf57f458012a66b2b15a3dd7d251690a7") -#endif ] where foo = L.fromChunks [T.encodeUtf8 $ T.pack "foo"] |