From db58a9c4ca61d99f378e41394c0e7dbc5a5ebd76 Mon Sep 17 00:00:00 2001
From: Tony Hannan <tony@10gen.com>
Date: Fri, 11 Mar 2011 11:11:14 -0500
Subject: [PATCH] use md5 from cryptohash package instead of nano-md5 to remove
 dependency on OpenSSL

---
 Database/MongoDB/Internal/Protocol.hs | 17 ++++++++++++++---
 mongoDB.cabal                         |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Database/MongoDB/Internal/Protocol.hs b/Database/MongoDB/Internal/Protocol.hs
index d260867..4ebfbd6 100644
--- a/Database/MongoDB/Internal/Protocol.hs
+++ b/Database/MongoDB/Internal/Protocol.hs
@@ -32,14 +32,17 @@ import Data.Int
 import Data.Bits
 import Data.IORef
 import System.IO.Unsafe (unsafePerformIO)
-import Data.Digest.OpenSSL.MD5 (md5sum)
+import qualified Crypto.Hash.MD5 as MD5 (hash)
 import Data.UString as U (pack, append, toByteString)
+import qualified Data.ByteString as BS (ByteString, unpack)
+import Data.Word (Word8)
 import System.IO.Error as E (try)
 import Control.Monad.Error
 import Control.Monad.Util (whenJust)
 import Network.Abstract hiding (send)
 import System.IO (hFlush)
 import Database.MongoDB.Internal.Util (hGetN, bitOr)
+import Numeric (showHex)
 
 -- Network -> Server -> (Sink, Source)
 -- (Sink, Source) -> Pipeline
@@ -306,7 +309,15 @@ type Password = UString
 type Nonce = UString
 
 pwHash :: Username -> Password -> UString
-pwHash u p = pack . md5sum . toByteString $ u `U.append` ":mongo:" `U.append` p
+pwHash u p = pack . byteStringHex . MD5.hash . toByteString $ u `U.append` ":mongo:" `U.append` p
 
 pwKey :: Nonce -> Username -> Password -> UString
-pwKey n u p = pack . md5sum . toByteString . U.append n . U.append u $ pwHash u p
+pwKey n u p = pack . byteStringHex . MD5.hash . toByteString . U.append n . U.append u $ pwHash u p
+
+byteStringHex :: BS.ByteString -> String
+-- ^ Hexadecimal string representation of a byte string. Each byte yields two hexadecimal characters.
+byteStringHex = concatMap byteHex . BS.unpack
+
+byteHex :: Word8 -> String
+-- ^ Two char hexadecimal representation of byte
+byteHex b = (if b < 16 then ('0' :) else id) (showHex b "")
diff --git a/mongoDB.cabal b/mongoDB.cabal
index 78ae771..6384877 100644
--- a/mongoDB.cabal
+++ b/mongoDB.cabal
@@ -1,5 +1,5 @@
 name: mongoDB
-version: 0.9.4
+version: 0.9.5
 build-type: Simple
 license: OtherLicense
 license-file: LICENSE
@@ -13,7 +13,7 @@ build-depends:
     bytestring -any,
     containers -any,
     mtl >= 2,
-    nano-md5 -any,
+    cryptohash -any,
     network -any,
     parsec -any,
     random -any