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

Merged in PabloMayobre/love-1/PabloMayobre/fixed-hash-functions-in-data-module-not--1543171550077 (pull request #117)

Browse Source 
Fixed hash functions in data module

Approved-by: Bart van Strien <bart.bes+projects@gmail.com>
Approved-by: Tae Hanazono <auahdark687291@gmail.com>
This commit is contained in:
Alex Szpakowski
2018-12-06 21:50:18 +00:00
parent 7253118100 ed68ac6b28
commit 2e190f4fa0
1 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/data/HashFunction.cpp
+47 -40
View File
@@ -79,17 +79,20 @@ public:
uint32 c0 = 0x98badcfe;
uint32 d0 = 0x10325476;
// Do the required padding
uint64 paddedLength = length;
if (length % 64 < 56)
paddedLength += 56-length%64;
if (length % 64 > 56)
paddedLength += 120-length%64;
uint8 *padded = new uint8[paddedLength+8];
//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;
uint8 *padded = new uint8[paddedLength + 8];
memcpy(padded, input, length);
memset(padded+length, 0, paddedLength-length);
memset(padded + length, 0, paddedLength - length);
padded[length] = 0x80;
*((uint64*) &padded[paddedLength]) = length*8;
//Now we need the length in bits
*((uint64*) &padded[paddedLength]) = length * 8;
paddedLength += 8;
for (uint64 i = 0; i < paddedLength; i += 64)
@@ -177,7 +180,7 @@ const uint32 MD5::constants[64] = {
/**
* The following implementation was based on the text, not the code listings,
* in RFC3174. I believe this means no copyright other than that of the LÖVE
* in RFC3174. I believe this means no copyright other than that of the L�VE
* Development Team applies.
**/
class SHA1 : public HashFunction
@@ -197,21 +200,22 @@ public:
0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0
};
// Same padding as for md5, but then big-endian
uint64 paddedLength = length;
if (length % 64 < 56)
paddedLength += 56-length%64;
if (length % 64 > 56)
paddedLength += 120-length%64;
uint8 *padded = new uint8[paddedLength+8];
//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;
uint8 *padded = new uint8[paddedLength + 8];
memcpy(padded, input, length);
memset(padded+length, 0, paddedLength-length);
memset(padded + length, 0, paddedLength - length);
padded[length] = 0x80;
// Now we need the length in bits
// 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;
padded[paddedLength] = (length >> (56 - i * 8)) & 0xFF;
// Allocate our extended words
uint32 words[80];
@@ -299,21 +303,22 @@ public:
if (!isSupported(function))
throw love::Exception("Hash function not supported by SHA-224/SHA-256 implementation");
// Same padding as for sha1
uint64 paddedLength = length;
if (length % 64 < 56)
paddedLength += 56-length%64;
if (length % 64 > 56)
paddedLength += 120-length%64;
uint8 *padded = new uint8[paddedLength+8];
//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;
uint8 *padded = new uint8[paddedLength + 8];
memcpy(padded, input, length);
memset(padded+length, 0, paddedLength-length);
memset(padded + length, 0, paddedLength - length);
padded[length] = 0x80;
// Now we need the length in bits
// 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;
padded[paddedLength] = (length >> (56 - i * 8)) & 0xFF;
uint32 intermediate[8];
if (function == FUNCTION_SHA224)
@@ -429,7 +434,7 @@ const uint32 SHA256::constants[64] = {
/**
* This implementation was based on the description in RFC-6234.
**/
// SHA-2: SHA-224 and SHA-256
// SHA-2: SHA-384 and SHA-512
class SHA512 : public HashFunction
{
private:
@@ -454,22 +459,24 @@ public:
else
memcpy(intermediates, initial512, sizeof(intermediates));
uint64 paddedLength = length;
if (length % 128 < 112)
paddedLength += 112-length%128;
if (length % 128 > 112)
paddedLength += 240-length%128;
uint8 *padded = new uint8[paddedLength+16];
//Do the required padding
uint64 paddedLength = length + 1; //Consider the appended bit
if (paddedLength % 128 < 112)
paddedLength += 112 - paddedLength % 128;
if (paddedLength % 128 > 112)
paddedLength += 240 - paddedLength % 128;
uint8 *padded = new uint8[paddedLength + 16];
paddedLength += 8;
memcpy(padded, input, length);
memset(padded+length, 0, paddedLength-length);
memset(padded + length, 0, paddedLength - length);
padded[length] = 0x80;
// Now we need the length in bits, note we only write a 64-bit int, so
// Now we need the length in bits (big endian), note we only write a 64-bit int, so
// we have filled the first 8 bytes with zeroes
length *= 8;
for (int i = 0; i < 8; ++i, ++paddedLength)
padded[paddedLength] = (length >> (56-i*8)) & 0xFF;
padded[paddedLength] = (length >> (56 - i * 8)) & 0xFF;
// Allocate our extended words
uint64 words[80];