#define _OLDOFFICE01_
+//too much register pressure
+//#define NEW_SIMD_CODE
+
#include "include/constants.h"
#include "include/kernel_vendor.h"
#include "OpenCL/common.c"
#include "include/rp_kernel.h"
#include "OpenCL/rp.c"
-
-#define COMPARE_S "OpenCL/check_single_comp4.c"
-#define COMPARE_M "OpenCL/check_multi_comp4.c"
+#include "OpenCL/simd.c"
typedef struct
{
} RC4_KEY;
-static void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j)
+void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j)
{
u8 tmp;
rc4_key->S[j] = tmp;
}
-static void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
+void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
{
u32 v = 0x03020100;
u32 a = 0x04040404;
}
}
-static u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 in[4], u32 out[4])
+u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 in[4], u32 out[4])
{
#pragma unroll
for (u32 k = 0; k < 4; k++)
return j;
}
-static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
+void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
u32 a = digest[0];
u32 b = digest[1];
digest[3] += d;
}
-static void gen336 (u32 digest_pre[4], u32 salt_buf[4], u32 digest[4])
+void gen336 (u32 digest_pre[4], u32 salt_buf[4], u32 digest[4])
{
u32 digest_t0[2];
u32 digest_t1[2];
const u32 lid = get_local_id (0);
- __local RC4_KEY rc4_keys[64];
-
- __local RC4_KEY *rc4_key = &rc4_keys[lid];
-
/**
* base
*/
if (gid >= gid_max) return;
u32 pw_buf0[4];
+ u32 pw_buf1[4];
pw_buf0[0] = pws[gid].i[ 0];
pw_buf0[1] = pws[gid].i[ 1];
pw_buf0[2] = pws[gid].i[ 2];
pw_buf0[3] = pws[gid].i[ 3];
-
- u32 pw_buf1[4];
-
pw_buf1[0] = pws[gid].i[ 4];
pw_buf1[1] = pws[gid].i[ 5];
pw_buf1[2] = pws[gid].i[ 6];
const u32 pw_len = pws[gid].pw_len;
+ /**
+ * shared
+ */
+
+ __local RC4_KEY rc4_keys[64];
+
+ __local RC4_KEY *rc4_key = &rc4_keys[lid];
+
/**
* salt
*/
* loop
*/
- for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
+ for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
{
- u32 w0[4];
-
- w0[0] = pw_buf0[0];
- w0[1] = pw_buf0[1];
- w0[2] = pw_buf0[2];
- w0[3] = pw_buf0[3];
-
- u32 w1[4];
-
- w1[0] = pw_buf1[0];
- w1[1] = pw_buf1[1];
- w1[2] = pw_buf1[2];
- w1[3] = pw_buf1[3];
-
- u32 w2[4];
-
- w2[0] = 0;
- w2[1] = 0;
- w2[2] = 0;
- w2[3] = 0;
-
- u32 w3[4];
-
- w3[0] = 0;
- w3[1] = 0;
- w3[2] = 0;
- w3[3] = 0;
+ u32x w0[4] = { 0 };
+ u32x w1[4] = { 0 };
+ u32x w2[4] = { 0 };
+ u32x w3[4] = { 0 };
- const u32 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
+ const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
append_0x80_2x4_VV (w0, w1, out_len);
- u32 w0_t[4];
- u32 w1_t[4];
- u32 w2_t[4];
- u32 w3_t[4];
+ /**
+ * md5
+ */
- make_unicode (w0, w0_t, w1_t);
- make_unicode (w1, w2_t, w3_t);
+ make_unicode (w1, w2, w3);
+ make_unicode (w0, w0, w1);
- w3_t[2] = out_len * 8 * 2;
+ w3[2] = out_len * 8 * 2;
+ w3[3] = 0;
u32 digest_pre[4];
digest_pre[2] = MD5M_C;
digest_pre[3] = MD5M_D;
- md5_transform (w0_t, w1_t, w2_t, w3_t, digest_pre);
+ md5_transform (w0, w1, w2, w3, digest_pre);
digest_pre[0] &= 0xffffffff;
digest_pre[1] &= 0x000000ff;
// now the 40 bit input for the MD5 which then will generate the RC4 key, so it's precomputable!
- w0_t[0] = digest[0];
- w0_t[1] = digest[1] & 0xff;
- w0_t[2] = 0x8000;
- w0_t[3] = 0;
- w1_t[0] = 0;
- w1_t[1] = 0;
- w1_t[2] = 0;
- w1_t[3] = 0;
- w2_t[0] = 0;
- w2_t[1] = 0;
- w2_t[2] = 0;
- w2_t[3] = 0;
- w3_t[0] = 0;
- w3_t[1] = 0;
- w3_t[2] = 9 * 8;
- w3_t[3] = 0;
+ w0[0] = digest[0];
+ w0[1] = digest[1] & 0xff;
+ w0[2] = 0x8000;
+ w0[3] = 0;
+ w1[0] = 0;
+ w1[1] = 0;
+ w1[2] = 0;
+ w1[3] = 0;
+ w2[0] = 0;
+ w2[1] = 0;
+ w2[2] = 0;
+ w2[3] = 0;
+ w3[0] = 0;
+ w3[1] = 0;
+ w3[2] = 9 * 8;
+ w3[3] = 0;
digest[0] = MD5M_A;
digest[1] = MD5M_B;
digest[2] = MD5M_C;
digest[3] = MD5M_D;
- md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
+ md5_transform (w0, w1, w2, w3, digest);
// now the RC4 part
u8 j = rc4_next_16 (rc4_key, 0, 0, encryptedVerifier, out);
- w0_t[0] = out[0];
- w0_t[1] = out[1];
- w0_t[2] = out[2];
- w0_t[3] = out[3];
- w1_t[0] = 0x80;
- w1_t[1] = 0;
- w1_t[2] = 0;
- w1_t[3] = 0;
- w2_t[0] = 0;
- w2_t[1] = 0;
- w2_t[2] = 0;
- w2_t[3] = 0;
- w3_t[0] = 0;
- w3_t[1] = 0;
- w3_t[2] = 16 * 8;
- w3_t[3] = 0;
+ w0[0] = out[0];
+ w0[1] = out[1];
+ w0[2] = out[2];
+ w0[3] = out[3];
+ w1[0] = 0x80;
+ w1[1] = 0;
+ w1[2] = 0;
+ w1[3] = 0;
+ w2[0] = 0;
+ w2[1] = 0;
+ w2[2] = 0;
+ w2[3] = 0;
+ w3[0] = 0;
+ w3[1] = 0;
+ w3[2] = 16 * 8;
+ w3[3] = 0;
digest[0] = MD5M_A;
digest[1] = MD5M_B;
digest[2] = MD5M_C;
digest[3] = MD5M_D;
- md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
+ md5_transform (w0, w1, w2, w3, digest);
rc4_next_16 (rc4_key, 16, j, digest, out);
- const u32 r0 = out[0];
- const u32 r1 = out[1];
- const u32 r2 = out[2];
- const u32 r3 = out[3];
-
- #include COMPARE_M
+ COMPARE_M_SIMD (out[0], out[1], out[2], out[3]);
}
}
const u32 lid = get_local_id (0);
- __local RC4_KEY rc4_keys[64];
-
- __local RC4_KEY *rc4_key = &rc4_keys[lid];
-
/**
* base
*/
if (gid >= gid_max) return;
u32 pw_buf0[4];
+ u32 pw_buf1[4];
pw_buf0[0] = pws[gid].i[ 0];
pw_buf0[1] = pws[gid].i[ 1];
pw_buf0[2] = pws[gid].i[ 2];
pw_buf0[3] = pws[gid].i[ 3];
-
- u32 pw_buf1[4];
-
pw_buf1[0] = pws[gid].i[ 4];
pw_buf1[1] = pws[gid].i[ 5];
pw_buf1[2] = pws[gid].i[ 6];
const u32 pw_len = pws[gid].pw_len;
/**
- * digest
+ * shared
*/
- const u32 search[4] =
- {
- digests_buf[digests_offset].digest_buf[DGST_R0],
- digests_buf[digests_offset].digest_buf[DGST_R1],
- digests_buf[digests_offset].digest_buf[DGST_R2],
- digests_buf[digests_offset].digest_buf[DGST_R3]
- };
+ __local RC4_KEY rc4_keys[64];
+
+ __local RC4_KEY *rc4_key = &rc4_keys[lid];
/**
* salt
encryptedVerifier[3] = oldoffice01_bufs[salt_pos].encryptedVerifier[3];
/**
- * loop
+ * digest
*/
- for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
+ const u32 search[4] =
{
- u32 w0[4];
-
- w0[0] = pw_buf0[0];
- w0[1] = pw_buf0[1];
- w0[2] = pw_buf0[2];
- w0[3] = pw_buf0[3];
-
- u32 w1[4];
-
- w1[0] = pw_buf1[0];
- w1[1] = pw_buf1[1];
- w1[2] = pw_buf1[2];
- w1[3] = pw_buf1[3];
-
- u32 w2[4];
-
- w2[0] = 0;
- w2[1] = 0;
- w2[2] = 0;
- w2[3] = 0;
+ digests_buf[digests_offset].digest_buf[DGST_R0],
+ digests_buf[digests_offset].digest_buf[DGST_R1],
+ digests_buf[digests_offset].digest_buf[DGST_R2],
+ digests_buf[digests_offset].digest_buf[DGST_R3]
+ };
- u32 w3[4];
+ /**
+ * loop
+ */
- w3[0] = 0;
- w3[1] = 0;
- w3[2] = 0;
- w3[3] = 0;
+ for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
+ {
+ u32x w0[4] = { 0 };
+ u32x w1[4] = { 0 };
+ u32x w2[4] = { 0 };
+ u32x w3[4] = { 0 };
- const u32 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
+ const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
append_0x80_2x4_VV (w0, w1, out_len);
- u32 w0_t[4];
- u32 w1_t[4];
- u32 w2_t[4];
- u32 w3_t[4];
+ /**
+ * md5
+ */
- make_unicode (w0, w0_t, w1_t);
- make_unicode (w1, w2_t, w3_t);
+ make_unicode (w1, w2, w3);
+ make_unicode (w0, w0, w1);
- w3_t[2] = out_len * 8 * 2;
+ w3[2] = out_len * 8 * 2;
+ w3[3] = 0;
u32 digest_pre[4];
digest_pre[2] = MD5M_C;
digest_pre[3] = MD5M_D;
- md5_transform (w0_t, w1_t, w2_t, w3_t, digest_pre);
+ md5_transform (w0, w1, w2, w3, digest_pre);
digest_pre[0] &= 0xffffffff;
digest_pre[1] &= 0x000000ff;
// now the 40 bit input for the MD5 which then will generate the RC4 key, so it's precomputable!
- w0_t[0] = digest[0];
- w0_t[1] = digest[1] & 0xff;
- w0_t[2] = 0x8000;
- w0_t[3] = 0;
- w1_t[0] = 0;
- w1_t[1] = 0;
- w1_t[2] = 0;
- w1_t[3] = 0;
- w2_t[0] = 0;
- w2_t[1] = 0;
- w2_t[2] = 0;
- w2_t[3] = 0;
- w3_t[0] = 0;
- w3_t[1] = 0;
- w3_t[2] = 9 * 8;
- w3_t[3] = 0;
+ w0[0] = digest[0];
+ w0[1] = digest[1] & 0xff;
+ w0[2] = 0x8000;
+ w0[3] = 0;
+ w1[0] = 0;
+ w1[1] = 0;
+ w1[2] = 0;
+ w1[3] = 0;
+ w2[0] = 0;
+ w2[1] = 0;
+ w2[2] = 0;
+ w2[3] = 0;
+ w3[0] = 0;
+ w3[1] = 0;
+ w3[2] = 9 * 8;
+ w3[3] = 0;
digest[0] = MD5M_A;
digest[1] = MD5M_B;
digest[2] = MD5M_C;
digest[3] = MD5M_D;
- md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
+ md5_transform (w0, w1, w2, w3, digest);
// now the RC4 part
u8 j = rc4_next_16 (rc4_key, 0, 0, encryptedVerifier, out);
- w0_t[0] = out[0];
- w0_t[1] = out[1];
- w0_t[2] = out[2];
- w0_t[3] = out[3];
- w1_t[0] = 0x80;
- w1_t[1] = 0;
- w1_t[2] = 0;
- w1_t[3] = 0;
- w2_t[0] = 0;
- w2_t[1] = 0;
- w2_t[2] = 0;
- w2_t[3] = 0;
- w3_t[0] = 0;
- w3_t[1] = 0;
- w3_t[2] = 16 * 8;
- w3_t[3] = 0;
+ w0[0] = out[0];
+ w0[1] = out[1];
+ w0[2] = out[2];
+ w0[3] = out[3];
+ w1[0] = 0x80;
+ w1[1] = 0;
+ w1[2] = 0;
+ w1[3] = 0;
+ w2[0] = 0;
+ w2[1] = 0;
+ w2[2] = 0;
+ w2[3] = 0;
+ w3[0] = 0;
+ w3[1] = 0;
+ w3[2] = 16 * 8;
+ w3[3] = 0;
digest[0] = MD5M_A;
digest[1] = MD5M_B;
digest[2] = MD5M_C;
digest[3] = MD5M_D;
- md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
+ md5_transform (w0, w1, w2, w3, digest);
rc4_next_16 (rc4_key, 16, j, digest, out);
- const u32 r0 = out[0];
- const u32 r1 = out[1];
- const u32 r2 = out[2];
- const u32 r3 = out[3];
-
- #include COMPARE_S
+ COMPARE_S_SIMD (out[0], out[1], out[2], out[3]);
}
}
projects / hashcat.git / blobdiff