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

Improve strictness in Blowfish rounds

Browse Source
This commit is contained in:
Olivier Chéron 2019-03-04 06:39:55 +01:00
parent 0f8dc3588d
commit 107317c84d
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/Cipher/Blowfish/Primitive.hs
View File

@ -11,7 +11,7 @@
-- Crypto.Cipher.Blowfish.Primitive, copyright (c) 2012 Stijn van Drongelen -- Crypto.Cipher.Blowfish.Primitive, copyright (c) 2012 Stijn van Drongelen
-- based on: BlowfishAux.hs (C) 2002 HardCore SoftWare, Doug Hoyte -- based on: BlowfishAux.hs (C) 2002 HardCore SoftWare, Doug Hoyte
-- (as found in Crypto-4.2.4) -- (as found in Crypto-4.2.4)
{-# LANGUAGE BangPatterns #-}
module Crypto.Cipher.Blowfish.Primitive module Crypto.Cipher.Blowfish.Primitive
( Context ( Context
, initBlowfish , initBlowfish
@ -154,7 +154,7 @@ cipherBlock (Context ar) inverse input = doRound input 0
where where
-- | Transform the input over 16 rounds -- | Transform the input over 16 rounds
doRound :: Word64 -> Int -> Word64 doRound :: Word64 -> Int -> Word64
doRound i roundIndex doRound !i roundIndex
| roundIndex == 16 = | roundIndex == 16 =
let final = (fromIntegral (p 16) `shiftL` 32) .|. fromIntegral (p 17) let final = (fromIntegral (p 16) `shiftL` 32) .|. fromIntegral (p 17)
in rotateL (i `xor` final) 32 in rotateL (i `xor` final) 32
@ -187,7 +187,7 @@ cipherBlockMutable :: KeySchedule -> Word64 -> IO Word64
cipherBlockMutable (KeySchedule ma) input = doRound input 0 cipherBlockMutable (KeySchedule ma) input = doRound input 0
where where
-- | Transform the input over 16 rounds -- | Transform the input over 16 rounds
doRound i roundIndex doRound !i roundIndex
| roundIndex == 16 = do | roundIndex == 16 = do
pVal1 <- mutableArrayRead32 ma 16 pVal1 <- mutableArrayRead32 ma 16
pVal2 <- mutableArrayRead32 ma 17 pVal2 <- mutableArrayRead32 ma 17