From 761574a65f04f492f83f47f4a1353f0219735a2c Mon Sep 17 00:00:00 2001
From: Vincent Hanquez <vincent@snarc.org>
Date: Mon, 11 May 2015 09:34:01 +0100
Subject: [PATCH] [internal] remove old cryptohash modules

---
 Crypto/Hash/Utils.hs     | 77 ----------------------------------------
 Crypto/Hash/Utils/Cpu.hs | 11 ------
 cryptonite.cabal         |  2 --
 3 files changed, 90 deletions(-)
 delete mode 100644 Crypto/Hash/Utils.hs
 delete mode 100644 Crypto/Hash/Utils/Cpu.hs

diff --git a/Crypto/Hash/Utils.hs b/Crypto/Hash/Utils.hs
deleted file mode 100644
index be14750..0000000
--- a/Crypto/Hash/Utils.hs
+++ /dev/null
@@ -1,77 +0,0 @@
-{-# LANGUAGE MagicHash, BangPatterns #-}
--- |
--- Module      : Crypto.Hash.Utils
--- License     : BSD-style
--- Maintainer  : Vincent Hanquez <vincent@snarc.org>
--- Stability   : experimental
--- Portability : unknown
---
--- Crypto hash utility for hexadecimal
---
-module Crypto.Hash.Utils
-    ( toHex
-    ) where
-
-import Data.ByteString (ByteString)
-import qualified Data.ByteString.Internal as B
-import GHC.Prim
-import GHC.Types
-import GHC.Word
-import Foreign.ForeignPtr (withForeignPtr)
-import Foreign.Ptr (plusPtr, castPtr)
-import Foreign.Storable (poke, peek)
-import Crypto.Hash.Utils.Cpu
-import Data.Bits (testBit)
-
--- | Convert a bytestring to the hexadecimal equivalent
--- using 0123456789abcdef as digit
-toHex :: ByteString -> ByteString
-toHex (B.PS fp off len) = B.unsafeCreate (len*2) $ \d ->
-        withForeignPtr fp $ \s -> start d (s `plusPtr` off)
-    where start db sb
-            | use32Hex && (len `testBit` 0) == False = loop32 db sb
-            | otherwise                              = loop8 db sb
-                where end            = sb `plusPtr` len
-                      -- write the hex output using 32 bits write.
-                      loop32 d s
-                         | s == end  = return ()
-                         | otherwise = do b1 <- fromIntegral `fmap` (peek s :: IO Word8)
-                                          b2 <- fromIntegral `fmap` (peek (s `plusPtr` 1) :: IO Word8)
-                                          poke (castPtr d) (to32 b1 b2)
-                                          loop32 (d `plusPtr` 4) (s `plusPtr` 2)
-                      -- write the hex output 8 bits, 2 at a time
-                      loop8 d s
-                         | s == end  = return ()
-                         | otherwise = do b <- fromIntegral `fmap` (peek s :: IO Word8)
-                                          poke d               (r tableHi b)
-                                          poke (d `plusPtr` 1) (r tableLo b)
-                                          loop8 (d `plusPtr` 2) (s `plusPtr` 1)
-
-          -- little endian version
-          to32 (I# i1) (I# i2) = W32# (or# (or# (or# hi2 lo2) hi1) lo1)
-            where !hi2 = uncheckedShiftL# (indexWord8OffAddr# tableLo i2) 24#
-                  !lo2 = uncheckedShiftL# (indexWord8OffAddr# tableHi i2) 16#
-                  !hi1 = uncheckedShiftL# (indexWord8OffAddr# tableLo i1) 8#
-                  !lo1 = indexWord8OffAddr# tableHi i1
-
-          r :: Addr# -> Int -> Word8
-          r table (I# index) = W8# (indexWord8OffAddr# table index)
-
-          !tableLo =
-                "0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef\
-                \0123456789abcdef0123456789abcdef"#
-          !tableHi =
-                "00000000000000001111111111111111\
-                \22222222222222223333333333333333\
-                \44444444444444445555555555555555\
-                \66666666666666667777777777777777\
-                \88888888888888889999999999999999\
-                \aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb\
-                \ccccccccccccccccdddddddddddddddd\
-                \eeeeeeeeeeeeeeeeffffffffffffffff"#
diff --git a/Crypto/Hash/Utils/Cpu.hs b/Crypto/Hash/Utils/Cpu.hs
deleted file mode 100644
index 4e4e447..0000000
--- a/Crypto/Hash/Utils/Cpu.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE CPP #-}
-module Crypto.Hash.Utils.Cpu
-    ( use32Hex
-    ) where
-
-use32Hex :: Bool
-#ifdef ARCH_X86
-use32Hex = True
-#else
-use32Hex = False
-#endif
diff --git a/cryptonite.cabal b/cryptonite.cabal
index 2ff7952..d34df28 100644
--- a/cryptonite.cabal
+++ b/cryptonite.cabal
@@ -101,8 +101,6 @@ Library
                      Crypto.Cipher.Types.Utils
                      Crypto.Error.Types
                      Crypto.Number.Compat
-                     Crypto.Hash.Utils
-                     Crypto.Hash.Utils.Cpu
                      Crypto.Hash.Types
                      Crypto.Hash.SHA1
                      Crypto.Hash.SHA224