LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 00:20:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix/improve SHA-224/256 hashing.

Browse Source
This commit is contained in:
ImagicTheCat
2023-05-24 16:10:53 +02:00
parent 4304132f8f
commit ade382072d
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/data/HashFunction.cpp
+11 -15
View File
@@ -303,22 +303,18 @@ public:
if (!isSupported(function))
throw love::Exception("Hash function not supported by SHA-224/SHA-256 implementation");
//Do the required padding (MD5, SHA1 and SHA2 use the same padding)
uint64 paddedLength = length + 1; //Consider the appended bit
if (paddedLength % 64 < 56)
paddedLength += 56 - paddedLength % 64;
if (paddedLength % 64 > 56)
paddedLength += 120 - paddedLength % 64;
// Compute final padded length, accounting for the appended bit (byte) and size
uint64 paddedLength = extend_multiple(length + 1 + 8, 64);
uint8 *padded = new uint8[paddedLength + 8];
uint32 *padded = new uint32[paddedLength / 4];
memcpy(padded, input, length);
memset(padded + length, 0, paddedLength - length);
padded[length] = 0x80;
memset(((uint8*)padded) + length, 0, paddedLength - length);
*(((uint8*)padded) + length) = 0x80; // append bit
// Now we need the length in bits (big endian)
length *= 8;
for (int i = 0; i < 8; ++i, ++paddedLength)
padded[paddedLength] = (length >> (56 - i * 8)) & 0xFF;
// Append length in bits (big endian)
uint64 bit_length = length * 8;
for (int i = 0; i < 8; ++i)
*(((uint8*)padded) + (paddedLength - 8 + i)) = (bit_length >> (56 - i * 8)) & 0xFF;
uint32 intermediate[8];
if (function == FUNCTION_SHA224)
@@ -329,9 +325,9 @@ public:
// Allocate our extended words
uint32 words[64];
for (uint64 i = 0; i < paddedLength; i += 64)
for (uint64 i = 0; i < paddedLength/4; i += 16)
{
uint32 *chunk = (uint32*) &padded[i];
uint32 *chunk = &padded[i];
for (int j = 0; j < 16; j++)
{
char *c = (char*) &words[j];