1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-24 08:58:13 +00:00

Merge branch 'matrix-fix_m13600'

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

View File

@ -15,7 +15,7 @@
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"
#define COMPARE_M "inc_comp_multi.cl" #define COMPARE_M "inc_comp_multi.cl"
void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5]) static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{ {
u32 A = digest[0]; u32 A = digest[0];
u32 B = digest[1]; u32 B = digest[1];
@ -143,7 +143,7 @@ void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u3
digest[4] += E; digest[4] += E;
} }
void hmac_sha1_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5]) static void hmac_sha1_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5])
{ {
w0[0] = w0[0] ^ 0x36363636; w0[0] = w0[0] ^ 0x36363636;
w0[1] = w0[1] ^ 0x36363636; w0[1] = w0[1] ^ 0x36363636;
@ -196,7 +196,7 @@ void hmac_sha1_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32
sha1_transform (w0, w1, w2, w3, opad); sha1_transform (w0, w1, w2, w3, opad);
} }
void hmac_sha1_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5], u32 digest[5]) static void hmac_sha1_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5], u32 digest[5])
{ {
digest[0] = ipad[0]; digest[0] = ipad[0];
digest[1] = ipad[1]; digest[1] = ipad[1];
@ -512,7 +512,8 @@ __kernel void m13600_comp (__global pw_t *pws, __global const kernel_rule_t *rul
break; break;
} }
for (int i = iter_start, j = 0; i < iter_stop; i++, j++) u32 i, j;
for (i = iter_start, j = 0; i < iter_stop; i++, j++)
{ {
key[j] = tmps[gid].out[i]; key[j] = tmps[gid].out[i];
} }