RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 12:32:43 +00:00
Code Issues Activity Actions

LibCrypto: Correctly pad blocks with FinalBlockSize < size < BlockSize

Browse source 
This fixes #2488
This commit is contained in:
AnotherTest 2020-06-04 16:46:26 +04:30 • committed by Andreas Kling
parent a3f51089d2
commit 63cc2f58ea
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Libraries/LibCrypto/Hash/SHA1.cpp
View file

@ -115,17 +115,26 @@ SHA1::DigestType SHA1::peek()
__builtin_memcpy(data, m_data_buffer, m_data_length); __builtin_memcpy(data, m_data_buffer, m_data_length);
__builtin_memcpy(state, m_state, 20); __builtin_memcpy(state, m_state, 20);
if (BlockSize == m_data_length) {
transform(m_data_buffer);
m_bit_length += BlockSize * 8;
m_data_length = 0;
i = 0;
}
if (m_data_length < FinalBlockDataSize) { if (m_data_length < FinalBlockDataSize) {
m_data_buffer[i++] = 0x80; m_data_buffer[i++] = 0x80;
while (i < FinalBlockDataSize) while (i < FinalBlockDataSize)
m_data_buffer[i++] = 0x00; m_data_buffer[i++] = 0x00;
} else { } else {
// First, complete a block with some padding.
m_data_buffer[i++] = 0x80; m_data_buffer[i++] = 0x80;
while (i < BlockSize) while (i < BlockSize)
m_data_buffer[i++] = 0x00; m_data_buffer[i++] = 0x00;
transform(m_data_buffer); transform(m_data_buffer);
// Then start another block with BlockSize - 8 bytes of zeros
__builtin_memset(m_data_buffer, 0, FinalBlockDataSize); __builtin_memset(m_data_buffer, 0, FinalBlockDataSize);
} }

22
Libraries/LibCrypto/Hash/SHA2.cpp
View file

@ -110,17 +110,26 @@ SHA256::DigestType SHA256::peek()
DigestType digest; DigestType digest;
size_t i = m_data_length; size_t i = m_data_length;
if (BlockSize == m_data_length) {
transform(m_data_buffer);
m_bit_length += BlockSize * 8;
m_data_length = 0;
i = 0;
}
if (m_data_length < FinalBlockDataSize) { if (m_data_length < FinalBlockDataSize) {
m_data_buffer[i++] = 0x80; m_data_buffer[i++] = 0x80;
while (i < FinalBlockDataSize) while (i < FinalBlockDataSize)
m_data_buffer[i++] = 0x00; m_data_buffer[i++] = 0x00;
} else { } else {
// First, complete a block with some padding.
m_data_buffer[i++] = 0x80; m_data_buffer[i++] = 0x80;
while (i < BlockSize) while (i < BlockSize)
m_data_buffer[i++] = 0x00; m_data_buffer[i++] = 0x00;
transform(m_data_buffer); transform(m_data_buffer);
// Then start another block with BlockSize - 8 bytes of zeros
__builtin_memset(m_data_buffer, 0, FinalBlockDataSize); __builtin_memset(m_data_buffer, 0, FinalBlockDataSize);
} }
@ -218,17 +227,26 @@ SHA512::DigestType SHA512::peek()
DigestType digest; DigestType digest;
size_t i = m_data_length; size_t i = m_data_length;
if (BlockSize == m_data_length) {
transform(m_data_buffer);
m_bit_length += BlockSize * 8;
m_data_length = 0;
i = 0;
}
if (m_data_length < FinalBlockDataSize) { if (m_data_length < FinalBlockDataSize) {
m_data_buffer[i++] = 0x80; m_data_buffer[i++] = 0x80;
while (i < FinalBlockDataSize) while (i < FinalBlockDataSize)
m_data_buffer[i++] = 0x00; m_data_buffer[i++] = 0x00;
} else { } else {
// First, complete a block with some padding.
m_data_buffer[i++] = 0x80; m_data_buffer[i++] = 0x80;
while (i < BlockSize) while (i < BlockSize)
m_data_buffer[i++] = 0x00; m_data_buffer[i++] = 0x00;
transform(m_data_buffer); transform(m_data_buffer);
// Then start another block with BlockSize - 8 bytes of zeros
__builtin_memset(m_data_buffer, 0, FinalBlockDataSize); __builtin_memset(m_data_buffer, 0, FinalBlockDataSize);
} }