1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-18 14:18:11 +00:00

Merge branch 'fix_m06400' of https://github.com/matrix/hashcat into matrix-fix_m06400

This commit is contained in:
jsteube 2016-11-28 10:47:58 +01:00
commit a2a02849f5

View File

@ -34,7 +34,7 @@ __constant u32 k_sha256[64] =
SHA256C3c, SHA256C3d, SHA256C3e, SHA256C3f, SHA256C3c, SHA256C3d, SHA256C3e, SHA256C3f,
}; };
void sha256_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[8]) static void sha256_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[8])
{ {
u32 a = digest[0]; u32 a = digest[0];
u32 b = digest[1]; u32 b = digest[1];
@ -122,7 +122,7 @@ void sha256_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const
digest[7] += h; digest[7] += h;
} }
void hmac_sha256_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u32 opad[8]) static void hmac_sha256_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u32 opad[8])
{ {
w0[0] = w0[0] ^ 0x36363636; w0[0] = w0[0] ^ 0x36363636;
w0[1] = w0[1] ^ 0x36363636; w0[1] = w0[1] ^ 0x36363636;
@ -181,7 +181,7 @@ void hmac_sha256_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u
sha256_transform (w0, w1, w2, w3, opad); sha256_transform (w0, w1, w2, w3, opad);
} }
void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u32 opad[8], u32 digest[8]) static void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u32 opad[8], u32 digest[8])
{ {
digest[0] = ipad[0]; digest[0] = ipad[0];
digest[1] = ipad[1]; digest[1] = ipad[1];