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

fix old version

Browse Source
This commit is contained in:
Vincent Hanquez 2015-03-30 15:50:05 +01:00
parent 5f2aa94355
commit 4a6bfe98fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Crypto/Data/AFIS.hs
View File

@ -81,7 +81,7 @@ split hashF rng expandTimes src
diffuse hashF lastBlock blockSize diffuse hashF lastBlock blockSize
fillRandomBlock g blockPtr = do fillRandomBlock g blockPtr = do
let (rand :: Bytes, g') = randomBytesGenerate blockSize g let (rand :: Bytes, g') = randomBytesGenerate blockSize g
withByteArray rand $ \randPtr -> B.memcpy blockPtr randPtr blockSize withByteArray rand $ \randPtr -> B.memcpy blockPtr randPtr (fromIntegral blockSize)
return g' return g'
-- | Merge previously diffused data back to the original data. -- | Merge previously diffused data back to the original data.
@ -126,10 +126,10 @@ diffuse :: HashAlgorithm a
diffuse hashF src sz = loop src 0 diffuse hashF src sz = loop src 0
where (full,pad) = sz `quotRem` digestSize where (full,pad) = sz `quotRem` digestSize
loop s i | i < full = do h <- hashBlock i `fmap` byteStringOfPtr s digestSize loop s i | i < full = do h <- hashBlock i `fmap` byteStringOfPtr s digestSize
withBytePtr h $ \hPtr -> B.memcpy s hPtr digestSize withBytePtr h $ \hPtr -> B.memcpy s hPtr (fromIntegral digestSize)
loop (s `plusPtr` digestSize) (i+1) loop (s `plusPtr` digestSize) (i+1)
| pad /= 0 = do h <- hashBlock i `fmap` byteStringOfPtr s pad | pad /= 0 = do h <- hashBlock i `fmap` byteStringOfPtr s pad
withBytePtr h $ \hPtr -> B.memcpy s hPtr pad withBytePtr h $ \hPtr -> B.memcpy s hPtr (fromIntegral pad)
return () return ()
| otherwise = return () | otherwise = return ()