1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-25 16:08:18 +00:00

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

This commit is contained in:
jsteube 2016-11-28 10:51:59 +01:00
commit cf4f04e2e3

View File

@ -701,7 +701,7 @@ __constant u32 rcon[] =
0x1b000000, 0x36000000, 0x1b000000, 0x36000000,
}; };
void AES256_ExpandKey (u32 *userkey, u32 *rek, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4) static void AES256_ExpandKey (u32 *userkey, u32 *rek, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
{ {
rek[0] = userkey[0]; rek[0] = userkey[0];
rek[1] = userkey[1]; rek[1] = userkey[1];
@ -751,7 +751,7 @@ void AES256_ExpandKey (u32 *userkey, u32 *rek, __local u32 *s_te0, __local u32 *
} }
} }
void AES256_InvertKey (u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4) static void AES256_InvertKey (u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
{ {
for (u32 i = 0, j = 56; i < j; i += 4, j -= 4) for (u32 i = 0, j = 56; i < j; i += 4, j -= 4)
{ {
@ -791,7 +791,7 @@ void AES256_InvertKey (u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local
} }
} }
void AES256_decrypt (const u32 *in, u32 *out, const u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4) static void AES256_decrypt (const u32 *in, u32 *out, const u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4)
{ {
u32 s0 = in[0] ^ rdk[0]; u32 s0 = in[0] ^ rdk[0];
u32 s1 = in[1] ^ rdk[1]; u32 s1 = in[1] ^ rdk[1];
@ -881,7 +881,7 @@ void AES256_decrypt (const u32 *in, u32 *out, const u32 *rdk, __local u32 *s_td0
^ rdk[59]; ^ rdk[59];
} }
void AES256_encrypt (const u32 *in, u32 *out, const u32 *rek, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4) static void AES256_encrypt (const u32 *in, u32 *out, const u32 *rek, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
{ {
u32 s0 = in[0] ^ rek[0]; u32 s0 = in[0] ^ rek[0];
u32 s1 = in[1] ^ rek[1]; u32 s1 = in[1] ^ rek[1];
@ -995,7 +995,7 @@ __constant u64 k_sha512[80] =
SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f, SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f,
}; };
void sha512_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const u64 w3[4], u64 dgst[8]) static void sha512_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const u64 w3[4], u64 dgst[8])
{ {
u64 a = dgst[0]; u64 a = dgst[0];
u64 b = dgst[1]; u64 b = dgst[1];