mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 16:18:09 +00:00
Cleanup -m 9700 kernels to latest standard
This commit is contained in:
parent
ac05a163e7
commit
d5d06b7023
@ -5,6 +5,9 @@
|
||||
|
||||
#define _OLDOFFICE01_
|
||||
|
||||
//too much register pressure
|
||||
//#define NEW_SIMD_CODE
|
||||
|
||||
#include "include/constants.h"
|
||||
#include "include/kernel_vendor.h"
|
||||
|
||||
@ -18,9 +21,7 @@
|
||||
#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
|
||||
{
|
||||
@ -591,10 +592,6 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 lid = get_local_id (0);
|
||||
|
||||
__local RC4_KEY rc4_keys[64];
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
@ -604,14 +601,12 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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];
|
||||
@ -619,6 +614,14 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 pw_len = pws[gid].pw_len;
|
||||
|
||||
/**
|
||||
* shared
|
||||
*/
|
||||
|
||||
__local RC4_KEY rc4_keys[64];
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* salt
|
||||
*/
|
||||
@ -647,49 +650,26 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* 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];
|
||||
u32x w0[4] = { 0 };
|
||||
u32x w1[4] = { 0 };
|
||||
u32x w2[4] = { 0 };
|
||||
u32x w3[4] = { 0 };
|
||||
|
||||
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;
|
||||
|
||||
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];
|
||||
|
||||
@ -698,7 +678,7 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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;
|
||||
@ -716,29 +696,29 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
// 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
|
||||
|
||||
@ -755,38 +735,33 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -806,10 +781,6 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 lid = get_local_id (0);
|
||||
|
||||
__local RC4_KEY rc4_keys[64];
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
@ -819,14 +790,12 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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];
|
||||
@ -835,16 +804,12 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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
|
||||
@ -870,53 +835,42 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
encryptedVerifier[2] = oldoffice01_bufs[salt_pos].encryptedVerifier[2];
|
||||
encryptedVerifier[3] = oldoffice01_bufs[salt_pos].encryptedVerifier[3];
|
||||
|
||||
/**
|
||||
* digest
|
||||
*/
|
||||
|
||||
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]
|
||||
};
|
||||
|
||||
/**
|
||||
* 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];
|
||||
u32x w0[4] = { 0 };
|
||||
u32x w1[4] = { 0 };
|
||||
u32x w2[4] = { 0 };
|
||||
u32x w3[4] = { 0 };
|
||||
|
||||
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;
|
||||
|
||||
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];
|
||||
|
||||
@ -925,7 +879,7 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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;
|
||||
@ -943,29 +897,29 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
// 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
|
||||
|
||||
@ -982,38 +936,33 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -5,6 +5,9 @@
|
||||
|
||||
#define _OLDOFFICE01_
|
||||
|
||||
//too much register pressure
|
||||
//#define NEW_SIMD_CODE
|
||||
|
||||
#include "include/constants.h"
|
||||
#include "include/kernel_vendor.h"
|
||||
|
||||
@ -16,9 +19,7 @@
|
||||
#include "include/kernel_functions.c"
|
||||
#include "OpenCL/types_ocl.c"
|
||||
#include "OpenCL/common.c"
|
||||
|
||||
#define COMPARE_S "OpenCL/check_single_comp4.c"
|
||||
#define COMPARE_M "OpenCL/check_multi_comp4.c"
|
||||
#include "OpenCL/simd.c"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@ -589,10 +590,6 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 lid = get_local_id (0);
|
||||
|
||||
__local RC4_KEY rc4_keys[64];
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
@ -601,52 +598,27 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
u32 wordl0[4];
|
||||
u32 pw_buf0[4];
|
||||
u32 pw_buf1[4];
|
||||
|
||||
wordl0[0] = pws[gid].i[ 0];
|
||||
wordl0[1] = pws[gid].i[ 1];
|
||||
wordl0[2] = pws[gid].i[ 2];
|
||||
wordl0[3] = pws[gid].i[ 3];
|
||||
|
||||
u32 wordl1[4];
|
||||
|
||||
wordl1[0] = pws[gid].i[ 4];
|
||||
wordl1[1] = pws[gid].i[ 5];
|
||||
wordl1[2] = pws[gid].i[ 6];
|
||||
wordl1[3] = pws[gid].i[ 7];
|
||||
|
||||
u32 wordl2[4];
|
||||
|
||||
wordl2[0] = 0;
|
||||
wordl2[1] = 0;
|
||||
wordl2[2] = 0;
|
||||
wordl2[3] = 0;
|
||||
|
||||
u32 wordl3[4];
|
||||
|
||||
wordl3[0] = 0;
|
||||
wordl3[1] = 0;
|
||||
wordl3[2] = 0;
|
||||
wordl3[3] = 0;
|
||||
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];
|
||||
pw_buf1[0] = pws[gid].i[4];
|
||||
pw_buf1[1] = pws[gid].i[5];
|
||||
pw_buf1[2] = pws[gid].i[6];
|
||||
pw_buf1[3] = pws[gid].i[7];
|
||||
|
||||
const u32 pw_l_len = pws[gid].pw_len;
|
||||
|
||||
if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
|
||||
{
|
||||
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].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
|
||||
@ -676,85 +648,85 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* 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)
|
||||
{
|
||||
const u32 pw_r_len = combs_buf[il_pos].pw_len;
|
||||
const u32x pw_r_len = pwlenx_create_combt (combs_buf, il_pos);
|
||||
|
||||
const u32 pw_len = pw_l_len + pw_r_len;
|
||||
const u32x pw_len = pw_l_len + pw_r_len;
|
||||
|
||||
u32 wordr0[4];
|
||||
/**
|
||||
* concat password candidate
|
||||
*/
|
||||
|
||||
wordr0[0] = combs_buf[il_pos].i[0];
|
||||
wordr0[1] = combs_buf[il_pos].i[1];
|
||||
wordr0[2] = combs_buf[il_pos].i[2];
|
||||
wordr0[3] = combs_buf[il_pos].i[3];
|
||||
u32x wordl0[4] = { 0 };
|
||||
u32x wordl1[4] = { 0 };
|
||||
u32x wordl2[4] = { 0 };
|
||||
u32x wordl3[4] = { 0 };
|
||||
|
||||
u32 wordr1[4];
|
||||
wordl0[0] = pw_buf0[0];
|
||||
wordl0[1] = pw_buf0[1];
|
||||
wordl0[2] = pw_buf0[2];
|
||||
wordl0[3] = pw_buf0[3];
|
||||
wordl1[0] = pw_buf1[0];
|
||||
wordl1[1] = pw_buf1[1];
|
||||
wordl1[2] = pw_buf1[2];
|
||||
wordl1[3] = pw_buf1[3];
|
||||
|
||||
wordr1[0] = combs_buf[il_pos].i[4];
|
||||
wordr1[1] = combs_buf[il_pos].i[5];
|
||||
wordr1[2] = combs_buf[il_pos].i[6];
|
||||
wordr1[3] = combs_buf[il_pos].i[7];
|
||||
u32x wordr0[4] = { 0 };
|
||||
u32x wordr1[4] = { 0 };
|
||||
u32x wordr2[4] = { 0 };
|
||||
u32x wordr3[4] = { 0 };
|
||||
|
||||
u32 wordr2[4];
|
||||
|
||||
wordr2[0] = 0;
|
||||
wordr2[1] = 0;
|
||||
wordr2[2] = 0;
|
||||
wordr2[3] = 0;
|
||||
|
||||
u32 wordr3[4];
|
||||
|
||||
wordr3[0] = 0;
|
||||
wordr3[1] = 0;
|
||||
wordr3[2] = 0;
|
||||
wordr3[3] = 0;
|
||||
wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
|
||||
wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
|
||||
wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
|
||||
wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
|
||||
wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
|
||||
wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
|
||||
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
|
||||
wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
|
||||
|
||||
if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
|
||||
{
|
||||
switch_buffer_by_offset_le (wordr0, wordr1, wordr2, wordr3, pw_l_len);
|
||||
switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len);
|
||||
}
|
||||
else
|
||||
{
|
||||
switch_buffer_by_offset_le_VV (wordl0, wordl1, wordl2, wordl3, pw_r_len);
|
||||
}
|
||||
|
||||
u32 w0[4];
|
||||
u32x w0[4];
|
||||
u32x w1[4];
|
||||
u32x w2[4];
|
||||
u32x w3[4];
|
||||
|
||||
w0[0] = wordl0[0] | wordr0[0];
|
||||
w0[1] = wordl0[1] | wordr0[1];
|
||||
w0[2] = wordl0[2] | wordr0[2];
|
||||
w0[3] = wordl0[3] | wordr0[3];
|
||||
|
||||
u32 w1[4];
|
||||
|
||||
w1[0] = wordl1[0] | wordr1[0];
|
||||
w1[1] = wordl1[1] | wordr1[1];
|
||||
w1[2] = wordl1[2] | wordr1[2];
|
||||
w1[3] = wordl1[3] | wordr1[3];
|
||||
|
||||
u32 w2[4];
|
||||
|
||||
w2[0] = wordl2[0] | wordr2[0];
|
||||
w2[1] = wordl2[1] | wordr2[1];
|
||||
w2[2] = wordl2[2] | wordr2[2];
|
||||
w2[3] = wordl2[3] | wordr2[3];
|
||||
|
||||
u32 w3[4];
|
||||
|
||||
w3[0] = wordl3[0] | wordr3[0];
|
||||
w3[1] = wordl3[1] | wordr3[1];
|
||||
w3[2] = 0;
|
||||
w3[2] = wordl3[2] | wordr3[2];
|
||||
w3[3] = wordl3[3] | wordr3[3];
|
||||
|
||||
/**
|
||||
* md5
|
||||
*/
|
||||
|
||||
make_unicode (w1, w2, w3);
|
||||
make_unicode (w0, w0, w1);
|
||||
|
||||
w3[2] = pw_len * 8 * 2;
|
||||
w3[3] = 0;
|
||||
|
||||
append_0x80_2x4 (w0, w1, pw_len);
|
||||
|
||||
u32 w0_t[4];
|
||||
u32 w1_t[4];
|
||||
u32 w2_t[4];
|
||||
u32 w3_t[4];
|
||||
|
||||
make_unicode (w0, w0_t, w1_t);
|
||||
make_unicode (w1, w2_t, w3_t);
|
||||
|
||||
w3_t[2] = pw_len * 8 * 2;
|
||||
|
||||
u32 digest_pre[4];
|
||||
|
||||
digest_pre[0] = MD5M_A;
|
||||
@ -762,7 +734,7 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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;
|
||||
@ -780,29 +752,29 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
// 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
|
||||
|
||||
@ -819,38 +791,33 @@ __kernel void m09700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -870,10 +837,6 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
const u32 lid = get_local_id (0);
|
||||
|
||||
__local RC4_KEY rc4_keys[64];
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
@ -882,52 +845,27 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
u32 wordl0[4];
|
||||
u32 pw_buf0[4];
|
||||
u32 pw_buf1[4];
|
||||
|
||||
wordl0[0] = pws[gid].i[ 0];
|
||||
wordl0[1] = pws[gid].i[ 1];
|
||||
wordl0[2] = pws[gid].i[ 2];
|
||||
wordl0[3] = pws[gid].i[ 3];
|
||||
|
||||
u32 wordl1[4];
|
||||
|
||||
wordl1[0] = pws[gid].i[ 4];
|
||||
wordl1[1] = pws[gid].i[ 5];
|
||||
wordl1[2] = pws[gid].i[ 6];
|
||||
wordl1[3] = pws[gid].i[ 7];
|
||||
|
||||
u32 wordl2[4];
|
||||
|
||||
wordl2[0] = 0;
|
||||
wordl2[1] = 0;
|
||||
wordl2[2] = 0;
|
||||
wordl2[3] = 0;
|
||||
|
||||
u32 wordl3[4];
|
||||
|
||||
wordl3[0] = 0;
|
||||
wordl3[1] = 0;
|
||||
wordl3[2] = 0;
|
||||
wordl3[3] = 0;
|
||||
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];
|
||||
pw_buf1[0] = pws[gid].i[4];
|
||||
pw_buf1[1] = pws[gid].i[5];
|
||||
pw_buf1[2] = pws[gid].i[6];
|
||||
pw_buf1[3] = pws[gid].i[7];
|
||||
|
||||
const u32 pw_l_len = pws[gid].pw_len;
|
||||
|
||||
if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
|
||||
{
|
||||
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].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
|
||||
@ -953,89 +891,101 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
encryptedVerifier[2] = oldoffice01_bufs[salt_pos].encryptedVerifier[2];
|
||||
encryptedVerifier[3] = oldoffice01_bufs[salt_pos].encryptedVerifier[3];
|
||||
|
||||
/**
|
||||
* digest
|
||||
*/
|
||||
|
||||
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]
|
||||
};
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
const u32 pw_r_len = combs_buf[il_pos].pw_len;
|
||||
const u32x pw_r_len = pwlenx_create_combt (combs_buf, il_pos);
|
||||
|
||||
const u32 pw_len = pw_l_len + pw_r_len;
|
||||
const u32x pw_len = pw_l_len + pw_r_len;
|
||||
|
||||
u32 wordr0[4];
|
||||
/**
|
||||
* concat password candidate
|
||||
*/
|
||||
|
||||
wordr0[0] = combs_buf[il_pos].i[0];
|
||||
wordr0[1] = combs_buf[il_pos].i[1];
|
||||
wordr0[2] = combs_buf[il_pos].i[2];
|
||||
wordr0[3] = combs_buf[il_pos].i[3];
|
||||
u32x wordl0[4] = { 0 };
|
||||
u32x wordl1[4] = { 0 };
|
||||
u32x wordl2[4] = { 0 };
|
||||
u32x wordl3[4] = { 0 };
|
||||
|
||||
u32 wordr1[4];
|
||||
wordl0[0] = pw_buf0[0];
|
||||
wordl0[1] = pw_buf0[1];
|
||||
wordl0[2] = pw_buf0[2];
|
||||
wordl0[3] = pw_buf0[3];
|
||||
wordl1[0] = pw_buf1[0];
|
||||
wordl1[1] = pw_buf1[1];
|
||||
wordl1[2] = pw_buf1[2];
|
||||
wordl1[3] = pw_buf1[3];
|
||||
|
||||
wordr1[0] = combs_buf[il_pos].i[4];
|
||||
wordr1[1] = combs_buf[il_pos].i[5];
|
||||
wordr1[2] = combs_buf[il_pos].i[6];
|
||||
wordr1[3] = combs_buf[il_pos].i[7];
|
||||
u32x wordr0[4] = { 0 };
|
||||
u32x wordr1[4] = { 0 };
|
||||
u32x wordr2[4] = { 0 };
|
||||
u32x wordr3[4] = { 0 };
|
||||
|
||||
u32 wordr2[4];
|
||||
|
||||
wordr2[0] = 0;
|
||||
wordr2[1] = 0;
|
||||
wordr2[2] = 0;
|
||||
wordr2[3] = 0;
|
||||
|
||||
u32 wordr3[4];
|
||||
|
||||
wordr3[0] = 0;
|
||||
wordr3[1] = 0;
|
||||
wordr3[2] = 0;
|
||||
wordr3[3] = 0;
|
||||
wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
|
||||
wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
|
||||
wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
|
||||
wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
|
||||
wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
|
||||
wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
|
||||
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
|
||||
wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
|
||||
|
||||
if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
|
||||
{
|
||||
switch_buffer_by_offset_le (wordr0, wordr1, wordr2, wordr3, pw_l_len);
|
||||
switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len);
|
||||
}
|
||||
else
|
||||
{
|
||||
switch_buffer_by_offset_le_VV (wordl0, wordl1, wordl2, wordl3, pw_r_len);
|
||||
}
|
||||
|
||||
u32 w0[4];
|
||||
u32x w0[4];
|
||||
u32x w1[4];
|
||||
u32x w2[4];
|
||||
u32x w3[4];
|
||||
|
||||
w0[0] = wordl0[0] | wordr0[0];
|
||||
w0[1] = wordl0[1] | wordr0[1];
|
||||
w0[2] = wordl0[2] | wordr0[2];
|
||||
w0[3] = wordl0[3] | wordr0[3];
|
||||
|
||||
u32 w1[4];
|
||||
|
||||
w1[0] = wordl1[0] | wordr1[0];
|
||||
w1[1] = wordl1[1] | wordr1[1];
|
||||
w1[2] = wordl1[2] | wordr1[2];
|
||||
w1[3] = wordl1[3] | wordr1[3];
|
||||
|
||||
u32 w2[4];
|
||||
|
||||
w2[0] = wordl2[0] | wordr2[0];
|
||||
w2[1] = wordl2[1] | wordr2[1];
|
||||
w2[2] = wordl2[2] | wordr2[2];
|
||||
w2[3] = wordl2[3] | wordr2[3];
|
||||
|
||||
u32 w3[4];
|
||||
|
||||
w3[0] = wordl3[0] | wordr3[0];
|
||||
w3[1] = wordl3[1] | wordr3[1];
|
||||
w3[2] = 0;
|
||||
w3[2] = wordl3[2] | wordr3[2];
|
||||
w3[3] = wordl3[3] | wordr3[3];
|
||||
|
||||
/**
|
||||
* md5
|
||||
*/
|
||||
|
||||
make_unicode (w1, w2, w3);
|
||||
make_unicode (w0, w0, w1);
|
||||
|
||||
w3[2] = pw_len * 8 * 2;
|
||||
w3[3] = 0;
|
||||
|
||||
append_0x80_2x4 (w0, w1, pw_len);
|
||||
|
||||
u32 w0_t[4];
|
||||
u32 w1_t[4];
|
||||
u32 w2_t[4];
|
||||
u32 w3_t[4];
|
||||
|
||||
make_unicode (w0, w0_t, w1_t);
|
||||
make_unicode (w1, w2_t, w3_t);
|
||||
|
||||
w3_t[2] = pw_len * 8 * 2;
|
||||
|
||||
u32 digest_pre[4];
|
||||
|
||||
digest_pre[0] = MD5M_A;
|
||||
@ -1043,7 +993,7 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
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;
|
||||
@ -1061,29 +1011,29 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
// 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
|
||||
|
||||
@ -1100,38 +1050,33 @@ __kernel void m09700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -246,6 +246,10 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
const u32 gid = get_global_id (0);
|
||||
const u32 lid = get_local_id (0);
|
||||
|
||||
/**
|
||||
* shared
|
||||
*/
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
@ -253,27 +257,30 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
*/
|
||||
|
||||
u32 salt_buf_t0[4];
|
||||
u32 salt_buf_t1[5];
|
||||
u32 salt_buf_t2[5];
|
||||
u32 salt_buf_t3[5];
|
||||
|
||||
salt_buf_t0[0] = salt_bufs[salt_pos].salt_buf[0];
|
||||
salt_buf_t0[1] = salt_bufs[salt_pos].salt_buf[1];
|
||||
salt_buf_t0[2] = salt_bufs[salt_pos].salt_buf[2];
|
||||
salt_buf_t0[3] = salt_bufs[salt_pos].salt_buf[3];
|
||||
|
||||
u32 salt_buf_t1[5];
|
||||
|
||||
salt_buf_t1[0] = salt_buf_t0[0] << 8;
|
||||
salt_buf_t1[1] = salt_buf_t0[0] >> 24 | salt_buf_t0[1] << 8;
|
||||
salt_buf_t1[2] = salt_buf_t0[1] >> 24 | salt_buf_t0[2] << 8;
|
||||
salt_buf_t1[3] = salt_buf_t0[2] >> 24 | salt_buf_t0[3] << 8;
|
||||
salt_buf_t1[4] = salt_buf_t0[3] >> 24;
|
||||
|
||||
u32 salt_buf_t2[5];
|
||||
|
||||
salt_buf_t2[0] = salt_buf_t0[0] << 16;
|
||||
salt_buf_t2[1] = salt_buf_t0[0] >> 16 | salt_buf_t0[1] << 16;
|
||||
salt_buf_t2[2] = salt_buf_t0[1] >> 16 | salt_buf_t0[2] << 16;
|
||||
salt_buf_t2[3] = salt_buf_t0[2] >> 16 | salt_buf_t0[3] << 16;
|
||||
salt_buf_t2[4] = salt_buf_t0[3] >> 16;
|
||||
|
||||
u32 salt_buf_t3[5];
|
||||
|
||||
salt_buf_t3[0] = salt_buf_t0[0] << 24;
|
||||
salt_buf_t3[1] = salt_buf_t0[0] >> 8 | salt_buf_t0[1] << 24;
|
||||
salt_buf_t3[2] = salt_buf_t0[1] >> 8 | salt_buf_t0[2] << 24;
|
||||
@ -307,6 +314,10 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
const u32 w0lr = w0l | w0r;
|
||||
|
||||
/**
|
||||
* md5
|
||||
*/
|
||||
|
||||
u32 w0_t[4];
|
||||
u32 w1_t[4];
|
||||
u32 w2_t[4];
|
||||
@ -368,23 +379,6 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
// generate the 16 * 21 buffer
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..5
|
||||
w0_t[0] = digest_t0[0];
|
||||
w0_t[1] = digest_t0[1];
|
||||
@ -424,23 +418,6 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..4
|
||||
w0_t[0] = digest_t3[1];
|
||||
|
||||
@ -477,23 +454,6 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..3
|
||||
w0_t[0] = digest_t2[1];
|
||||
|
||||
@ -530,23 +490,6 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..2
|
||||
w0_t[0] = digest_t1[1];
|
||||
|
||||
@ -583,23 +526,6 @@ static void m09700m (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..1
|
||||
w0_t[0] = digest_t0[1];
|
||||
|
||||
@ -737,46 +663,41 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
const u32 gid = get_global_id (0);
|
||||
const u32 lid = get_local_id (0);
|
||||
|
||||
__local RC4_KEY *rc4_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* 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_key = &rc4_keys[lid];
|
||||
|
||||
/**
|
||||
* salt
|
||||
*/
|
||||
|
||||
u32 salt_buf_t0[4];
|
||||
u32 salt_buf_t1[5];
|
||||
u32 salt_buf_t2[5];
|
||||
u32 salt_buf_t3[5];
|
||||
|
||||
salt_buf_t0[0] = salt_bufs[salt_pos].salt_buf[0];
|
||||
salt_buf_t0[1] = salt_bufs[salt_pos].salt_buf[1];
|
||||
salt_buf_t0[2] = salt_bufs[salt_pos].salt_buf[2];
|
||||
salt_buf_t0[3] = salt_bufs[salt_pos].salt_buf[3];
|
||||
|
||||
u32 salt_buf_t1[5];
|
||||
|
||||
salt_buf_t1[0] = salt_buf_t0[0] << 8;
|
||||
salt_buf_t1[1] = salt_buf_t0[0] >> 24 | salt_buf_t0[1] << 8;
|
||||
salt_buf_t1[2] = salt_buf_t0[1] >> 24 | salt_buf_t0[2] << 8;
|
||||
salt_buf_t1[3] = salt_buf_t0[2] >> 24 | salt_buf_t0[3] << 8;
|
||||
salt_buf_t1[4] = salt_buf_t0[3] >> 24;
|
||||
|
||||
u32 salt_buf_t2[5];
|
||||
|
||||
salt_buf_t2[0] = salt_buf_t0[0] << 16;
|
||||
salt_buf_t2[1] = salt_buf_t0[0] >> 16 | salt_buf_t0[1] << 16;
|
||||
salt_buf_t2[2] = salt_buf_t0[1] >> 16 | salt_buf_t0[2] << 16;
|
||||
salt_buf_t2[3] = salt_buf_t0[2] >> 16 | salt_buf_t0[3] << 16;
|
||||
salt_buf_t2[4] = salt_buf_t0[3] >> 16;
|
||||
|
||||
u32 salt_buf_t3[5];
|
||||
|
||||
salt_buf_t3[0] = salt_buf_t0[0] << 24;
|
||||
salt_buf_t3[1] = salt_buf_t0[0] >> 8 | salt_buf_t0[1] << 24;
|
||||
salt_buf_t3[2] = salt_buf_t0[1] >> 8 | salt_buf_t0[2] << 24;
|
||||
@ -798,6 +719,18 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
encryptedVerifier[2] = oldoffice01_bufs[salt_pos].encryptedVerifier[2];
|
||||
encryptedVerifier[3] = oldoffice01_bufs[salt_pos].encryptedVerifier[3];
|
||||
|
||||
/**
|
||||
* digest
|
||||
*/
|
||||
|
||||
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]
|
||||
};
|
||||
|
||||
/**
|
||||
* loop
|
||||
*/
|
||||
@ -810,6 +743,10 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
const u32 w0lr = w0l | w0r;
|
||||
|
||||
/**
|
||||
* md5
|
||||
*/
|
||||
|
||||
u32 w0_t[4];
|
||||
u32 w1_t[4];
|
||||
u32 w2_t[4];
|
||||
@ -871,23 +808,6 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
// generate the 16 * 21 buffer
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..5
|
||||
w0_t[0] = digest_t0[0];
|
||||
w0_t[1] = digest_t0[1];
|
||||
@ -927,23 +847,6 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..4
|
||||
w0_t[0] = digest_t3[1];
|
||||
|
||||
@ -980,23 +883,6 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..3
|
||||
w0_t[0] = digest_t2[1];
|
||||
|
||||
@ -1033,23 +919,6 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..2
|
||||
w0_t[0] = digest_t1[1];
|
||||
|
||||
@ -1086,23 +955,6 @@ static void m09700s (__local RC4_KEY *rc4_keys, u32 w0[4], u32 w1[4], u32 w2[4],
|
||||
|
||||
md5_transform (w0_t, w1_t, w2_t, w3_t, digest);
|
||||
|
||||
w0_t[0] = 0;
|
||||
w0_t[1] = 0;
|
||||
w0_t[2] = 0;
|
||||
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] = 0;
|
||||
w3_t[3] = 0;
|
||||
|
||||
// 0..1
|
||||
w0_t[0] = digest_t0[1];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user