RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:37:35 +00:00
Code Issues Activity Actions

LibTLS: Count the mac size towards the packet length in CBC mode

Browse source 
This is a regression introduced in 1172746, where the padding would be
done without accounting for the added MAC bytes.
Fixes #4098.
This commit is contained in:
AnotherTest 2020-11-16 14:11:57 +03:30 • committed by Andreas Kling
parent 2a06b026ef
commit de4061ff94
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibTLS/Record.cpp
View file

@ -77,10 +77,10 @@ void TLSv12::update_packet(ByteBuffer& packet)
// If the length is already a multiple a block_size, // If the length is already a multiple a block_size,
// an entire block of padding is added. // an entire block of padding is added.
// In short, we _never_ have no padding. // In short, we _never_ have no padding.
padding = block_size - length % block_size;
length += padding;
mac_size = mac_length(); mac_size = mac_length();
length += mac_size; length += mac_size;
padding = block_size - length % block_size;
length += padding;
} else { } else {
block_size = m_aes_local.gcm->cipher().block_size(); block_size = m_aes_local.gcm->cipher().block_size();
padding = 0; padding = 0;