Switch to cryptonite-based hashing.

2 files changed, 7 insertions, 5 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index b625176d..4b1199b4 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -178,7 +178,8 @@ library
                      , vector       >= 0.10
 
                        -- Hashing
-                     , cryptohash   >= 0.10
+                     , cryptonite
+                     , memory
                      , hashable     >= 1.2
 
                        -- Codecs & Serialization
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 8746fff5..1f70aea2 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -153,7 +153,7 @@ import Control.DeepSeq
 import Control.Exception
 import Control.Lens
 import Control.Monad
-import Crypto.Hash.SHA1 as SHA1
+import Crypto.Hash
 #ifdef VERSION_bencoding
 import Data.BEncode as BE
 import Data.BEncode.Types as BE
@@ -162,6 +162,7 @@ import Data.Bits
 #ifdef VERSION_bits_extras
 import Data.Bits.Extras
 #endif
+import qualified Data.ByteArray as Bytes
 import Data.ByteString as BS
 import Data.ByteString.Base16 as Base16
 import Data.ByteString.Base32 as Base32
@@ -645,7 +646,7 @@ pieceSize Piece {..} = fromIntegral (BL.length pieceData)
 
 -- | Get piece hash.
 hashPiece :: Piece BL.ByteString -> PieceHash
-hashPiece Piece {..} = SHA1.hashlazy pieceData
+hashPiece Piece {..} = Bytes.convert (hashlazy pieceData :: Digest SHA1)
 
 {-----------------------------------------------------------------------
 -- Piece control
@@ -728,7 +729,7 @@ checkPieceLazy :: PieceInfo -> Piece BL.ByteString -> Bool
 checkPieceLazy pinfo @ PieceInfo {..} Piece {..}
   = (fromIntegral (BL.length pieceData) == piPieceLength
      || isLastPiece pinfo pieceIndex)
-  && SHA1.hashlazy pieceData == pieceHash pinfo pieceIndex
+  && Bytes.convert (hashlazy pieceData :: Digest SHA1) == pieceHash pinfo pieceIndex
 
 {-----------------------------------------------------------------------
 --  Info dictionary
@@ -774,7 +775,7 @@ instance Hashable InfoDict where
 
 -- | Hash lazy bytestring using SHA1 algorithm.
 hashLazyIH :: BL.ByteString -> InfoHash
-hashLazyIH = either (const (error msg)) id . safeConvert . SHA1.hashlazy
+hashLazyIH = either (const (error msg)) id . safeConvert . (Bytes.convert :: Digest SHA1 -> BS.ByteString) . hashlazy
   where
     msg = "Infohash.hash: impossible: SHA1 is always 20 bytes long"