diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2017-08-16 11:41:25 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-08-16 11:41:25 -0700 |
commit | 379f036b39e0f7dac360ba04b281f6ea4ce8f20e (patch) | |
tree | 01a86517d6234562088561c3c4b51365ed722807 /HTTP/ProofOfWork.hs | |
parent | 680449e656820db2b899a8631060cf62359b9b74 (diff) | |
parent | 0229f026b1ae0344c4c052593564800035268d81 (diff) | |
download | keysafe-379f036b39e0f7dac360ba04b281f6ea4ce8f20e.tar.gz |
Merge tag '0.20170811'
tagging package keysafe version 0.20170811
# gpg: Signature made Fri 11 Aug 2017 03:58:54 PM MST
# gpg: using RSA key 28A500C35207EAB72F6C0F25DB12DB0FF05F8F38
# gpg: Good signature from "Joey Hess <joeyh@joeyh.name>" [full]
# Primary key fingerprint: E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7
# Subkey fingerprint: 28A5 00C3 5207 EAB7 2F6C 0F25 DB12 DB0F F05F 8F38
Diffstat (limited to 'HTTP/ProofOfWork.hs')
-rw-r--r-- | HTTP/ProofOfWork.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/HTTP/ProofOfWork.hs b/HTTP/ProofOfWork.hs index 61fea20..54e2223 100644 --- a/HTTP/ProofOfWork.hs +++ b/HTTP/ProofOfWork.hs @@ -16,7 +16,7 @@ import ByteStrings import GHC.Generics import qualified Data.Text as T import qualified Data.ByteString as B -import Data.Text.Encoding (encodeUtf8) +import Data.Text.Encoding (decodeUtf8, encodeUtf8) import Raaz.Core.Encode import qualified Raaz import Data.BloomFilter.Hash @@ -109,7 +109,7 @@ mkRequestID secret = mkRequeestID' secret <$> mkRandomSalt mkRequeestID' :: RequestIDSecret -> RandomSalt -> RequestID mkRequeestID' (RequestIDSecret key) salt = let hmac = Raaz.hmacSha256 key (encodeUtf8 $ fromRandomSalt salt) - in RequestID salt (T.pack (showBase16 hmac)) + in RequestID salt $ decodeUtf8 $ Raaz.toByteString (Raaz.encode hmac :: Base16) validRequestID :: RequestIDSecret -> RequestID -> Bool validRequestID secret rid = |