haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[hash] replace scrub by reset

Browse Source 
reset make more sense as it leave the mutable context in a state where
it can be re-used by further update, whereas scrub doesn't.
This commit is contained in:
Vincent Hanquez 2015-05-19 11:50:56 +01:00
parent 987f9e7bb6
commit 9794e2132b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Crypto/Hash/IO.hs
View File

@ -16,7 +16,7 @@ module Crypto.Hash.IO
, hashMutableInitWith , hashMutableInitWith
, hashMutableUpdate , hashMutableUpdate
, hashMutableFinalize , hashMutableFinalize
, hashMutableScrub , hashMutableReset
) where ) where
import Crypto.Hash.Types import Crypto.Hash.Types
@ -56,6 +56,9 @@ hashMutableFinalize mc = doFinalize undefined (B.withByteArray mc) B.alloc
hashInternalFinalize ctx dig hashInternalFinalize ctx dig
return $ Digest b return $ Digest b
-- FIXME not implemented just yet. -- | Reset the mutable context to the initial state of the hash
hashMutableScrub :: HashAlgorithm a => MutableContext a -> IO () hashMutableReset :: HashAlgorithm a => MutableContext a -> IO ()
hashMutableScrub (MutableContext _) = return () hashMutableReset mc = doReset mc (B.withByteArray mc)
where
doReset :: HashAlgorithm a => MutableContext a -> ((Ptr (Context a) -> IO ()) -> IO ()) -> IO ()
doReset _ withCtx = withCtx hashInternalInit

2
Crypto/MAC/HMAC.hs
View File

@ -69,7 +69,7 @@ initialize secret = unsafeDoIO (doHashAlg undefined)
ctx <- hashMutableInitWith alg ctx <- hashMutableInitWith alg
hashMutableUpdate ctx secret hashMutableUpdate ctx secret
digest <- hashMutableFinalize ctx digest <- hashMutableFinalize ctx
hashMutableScrub ctx hashMutableReset ctx
-- pad it if necessary -- pad it if necessary
if digestSize < blockSize if digestSize < blockSize
then do then do