From 973180b077e60b5d12d7c57d926878d11d7f2105 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 15 May 2017 18:10:13 -0400 Subject: stop using MissingH for MD5 Cryptonite is faster and allocates less, and I want to get rid of MissingH use. Note that the new dependency on memory is free; it's a dependency of cryptonite. This commit was supported by the NSF-funded DataLad project. --- Backend/Utilities.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Backend') diff --git a/Backend/Utilities.hs b/Backend/Utilities.hs index d1fb94f2a..1691fa2b2 100644 --- a/Backend/Utilities.hs +++ b/Backend/Utilities.hs @@ -7,10 +7,9 @@ module Backend.Utilities where -import Data.Hash.MD5 - import Annex.Common import Utility.FileSystemEncoding +import Utility.Hash {- Generates a keyName from an input string. Takes care of sanitizing it. - If it's not too long, the full string is used as the keyName. @@ -20,7 +19,8 @@ genKeyName :: String -> String genKeyName s -- Avoid making keys longer than the length of a SHA256 checksum. | bytelen > sha256len = - truncateFilePath (sha256len - md5len - 1) s' ++ "-" ++ md5s (Str s) + truncateFilePath (sha256len - md5len - 1) s' ++ "-" ++ + show (md5 (encodeBS s)) | otherwise = s' where s' = preSanitizeKeyName s -- cgit v1.2.3