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

While it's probably safe, don't use a "pure" bytestring as a buffer.

Browse Source 
reallocate a new buffer and copy the old thing inside.
This commit is contained in:
Vincent Hanquez 2014-10-04 22:37:31 +01:00
parent d2fa875c11
commit 022f16eeef
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Crypto/KDF/Scrypt.hs
View File

@ -16,11 +16,13 @@ module Crypto.KDF.Scrypt
import Data.Word import Data.Word
import Data.Bits import Data.Bits
import Data.Byteable
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.Byteable import qualified Data.ByteString.Internal as B
import Foreign.Marshal.Alloc import Foreign.Marshal.Alloc
import Foreign.Ptr (Ptr, plusPtr) import Foreign.Ptr (Ptr, plusPtr)
import Foreign.ForeignPtr (withForeignPtr)
import Control.Monad (forM_) import Control.Monad (forM_)
import System.IO.Unsafe import System.IO.Unsafe
@ -49,14 +51,16 @@ generate params
| popCount (n params) /= 1 = | popCount (n params) /= 1 =
error "Scrypt: invalid parameters: n not a power of 2" error "Scrypt: invalid parameters: n not a power of 2"
| otherwise = unsafePerformIO $ do | otherwise = unsafePerformIO $ do
let b = PBKDF2.generate prf let b = PBKDF2.generate prf (PBKDF2.Parameters (password params) (salt params) 1 intLen)
(PBKDF2.Parameters (password params) (salt params) 1 (p params * 128 * r params)) fptr <- B.mallocByteString intLen
allocaBytesAligned (128*(fromIntegral $ n params)*(r params)) 8 $ \v -> allocaBytesAligned (128*(fromIntegral $ n params)*(r params)) 8 $ \v ->
allocaBytesAligned (256*r params) 8 $ \xy -> allocaBytesAligned (256*r params) 8 $ \xy ->
withBytePtr b $ \bPtr -> withForeignPtr fptr $ \bPtr -> do
withBytePtr b $ \bOrig -> B.memcpy bPtr bOrig intLen
forM_ [0..(p params-1)] $ \i -> forM_ [0..(p params-1)] $ \i ->
ccryptonite_scrypt_smix (bPtr `plusPtr` (i * 128 * (r params))) ccryptonite_scrypt_smix (bPtr `plusPtr` (i * 128 * (r params)))
(fromIntegral $ r params) (n params) v xy (fromIntegral $ r params) (n params) v xy
return $ PBKDF2.generate prf (PBKDF2.Parameters (password params) b 1 (outputLength params)) return $ PBKDF2.generate prf (PBKDF2.Parameters (password params) (B.PS fptr 0 intLen) 1 (outputLength params))
where prf = PBKDF2.prfHMAC SHA256 where prf = PBKDF2.prfHMAC SHA256
intLen = p params * 128 * r params