yogsototh/hs-tls
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use strict time constant version of and and bytestring == during Reception.

Browse source
This commit is contained in:
Vincent Hanquez 2011-10-02 22:15:42 +01:00
parent bb9d46447f
commit 09e32f10c7
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Network/TLS/Receiving.hs
View file

@ -181,9 +181,7 @@ getCipherData (Record pt ver _) cdata = do
Just digest -> do
let new_hdr = Header pt ver (fromIntegral $ B.length $ cipherDataContent cdata)
expected_digest <- makeDigest False new_hdr $ cipherDataContent cdata
if expected_digest == digest
then return True
else return False
return (expected_digest `bytesEq` digest)
-- check if the padding is filled with the correct pattern if it exists
paddingValid <- case cipherDataPadding cdata of
@ -191,11 +189,9 @@ getCipherData (Record pt ver _) cdata = do
Just pad -> do
cver <- stVersion <$> get
let b = B.length pad - 1
if cver < TLS10
then return True
else return $ maybe True (const False) $ B.find (/= fromIntegral b) pad
return (if cver < TLS10 then True else B.replicate (B.length pad) (fromIntegral b) `bytesEq` pad)
unless (and $! [ macValid, paddingValid ]) $ do
unless (macValid &&! paddingValid) $ do
throwError $ Error_Protocol ("bad record mac", True, BadRecordMac)
return $ cipherDataContent cdata