diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-15 18:10:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-15 21:36:03 -0400 |
| commit | 973180b077e60b5d12d7c57d926878d11d7f2105 (patch) | |
| tree | 7d3bc5e651d330c1945c81f356b59eca90e73ea2 /Annex/Ssh.hs | |
| parent | 0d85a42333484e1acb8e4942a619087768bc62fb (diff) | |
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.
Diffstat (limited to 'Annex/Ssh.hs')
| -rw-r--r-- | Annex/Ssh.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index c53802941..a9ff91751 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -33,6 +33,7 @@ import Config import Annex.Path import Utility.Env import Utility.FileSystemEncoding +import Utility.Hash import Types.CleanupActions import Types.Concurrency import Git.Env @@ -42,7 +43,6 @@ import Annex.Perms import Annex.LockPool #endif -import Data.Hash.MD5 import Control.Concurrent.STM {- Some ssh commands are fed stdin on a pipe and so should be allowed to @@ -287,7 +287,7 @@ hostport2socket host Nothing = hostport2socket' host hostport2socket host (Just port) = hostport2socket' $ host ++ "!" ++ show port hostport2socket' :: String -> FilePath hostport2socket' s - | length s > lengthofmd5s = md5s (Str s) + | length s > lengthofmd5s = show $ md5 $ encodeBS s | otherwise = s where lengthofmd5s = 32 |