diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Utility/Verifiable.hs | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Utility/Verifiable.hs')
| -rw-r--r-- | Utility/Verifiable.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Utility/Verifiable.hs b/Utility/Verifiable.hs index a861416e2..278c320ae 100644 --- a/Utility/Verifiable.hs +++ b/Utility/Verifiable.hs @@ -7,11 +7,12 @@ module Utility.Verifiable where -import Data.Digest.Pure.SHA -import Data.ByteString.Lazy.UTF8 (fromString) -import qualified Data.ByteString.Lazy as L +import Data.ByteString.UTF8 (fromString) +import qualified Data.ByteString as S -type Secret = L.ByteString +import Utility.Hash + +type Secret = S.ByteString type HMACDigest = String {- A value, verifiable using a HMAC digest and a secret. -} @@ -28,7 +29,7 @@ verify :: (Eq a, Show a) => Verifiable a -> Secret -> Bool verify v secret = v == mkVerifiable (verifiableVal v) secret calcDigest :: String -> Secret -> HMACDigest -calcDigest v secret = showDigest $ hmacSha1 secret $ fromString v +calcDigest v secret = calcMac HmacSha1 secret (fromString v) {- for quickcheck -} prop_verifiable_sane :: String -> String -> Bool |