arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 07:08:19 +00:00
Code Issues Releases Wiki Activity

Cleanup -m 115xx kernels to latest standard

Browse Source
This commit is contained in:
Jens Steube 2016-04-18 15:51:48 +02:00
parent b6ba4d489a
commit 76d74bdc04
3 changed files with 250 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenCL/m11500_a0.cl
View File

@ -7,7 +7,8 @@
#define _CRC32_ #define _CRC32_
#define NEW_SIMD_CODE //incompatible because of branches
//#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -152,14 +153,12 @@ __kernel void m11500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 pw_buf0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
pw_buf0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[ 0];
pw_buf0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[ 1];
pw_buf0[2] = pws[gid].i[ 2]; pw_buf0[2] = pws[gid].i[ 2];
pw_buf0[3] = pws[gid].i[ 3]; pw_buf0[3] = pws[gid].i[ 3];
u32 pw_buf1[4];
pw_buf1[0] = pws[gid].i[ 4]; pw_buf1[0] = pws[gid].i[ 4];
pw_buf1[1] = pws[gid].i[ 5]; pw_buf1[1] = pws[gid].i[ 5];
pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[2] = pws[gid].i[ 6];
@ -168,7 +167,7 @@ __kernel void m11500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 pw_len = pws[gid].pw_len; const u32 pw_len = pws[gid].pw_len;
/** /**
* digest * salt
*/ */
const u32 iv = salt_bufs[salt_pos].salt_buf[0]; const u32 iv = salt_bufs[salt_pos].salt_buf[0];
@ -186,6 +185,10 @@ __kernel void m11500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
/**
* crc32
*/
u32x w[16]; u32x w[16];
w[ 0] = w0[0]; w[ 0] = w0[0];
@ -205,7 +208,7 @@ __kernel void m11500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w[14] = 0; w[14] = 0;
w[15] = 0; w[15] = 0;
u32x a = crc32_VV (w, out_len, iv); u32x a = crc32 (w, out_len, iv);
u32x b = 0; u32x b = 0;
u32x c = 0; u32x c = 0;
u32x d = 0; u32x d = 0;
@ -239,14 +242,12 @@ __kernel void m11500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 pw_buf0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
pw_buf0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[ 0];
pw_buf0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[ 1];
pw_buf0[2] = pws[gid].i[ 2]; pw_buf0[2] = pws[gid].i[ 2];
pw_buf0[3] = pws[gid].i[ 3]; pw_buf0[3] = pws[gid].i[ 3];
u32 pw_buf1[4];
pw_buf1[0] = pws[gid].i[ 4]; pw_buf1[0] = pws[gid].i[ 4];
pw_buf1[1] = pws[gid].i[ 5]; pw_buf1[1] = pws[gid].i[ 5];
pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[2] = pws[gid].i[ 6];
@ -255,11 +256,15 @@ __kernel void m11500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 pw_len = pws[gid].pw_len; const u32 pw_len = pws[gid].pw_len;
/** /**
* digest * salt
*/ */
const u32 iv = salt_bufs[salt_pos].salt_buf[0]; const u32 iv = salt_bufs[salt_pos].salt_buf[0];
/**
* digest
*/
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
@ -281,6 +286,10 @@ __kernel void m11500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
/**
* crc32
*/
u32x w[16]; u32x w[16];
w[ 0] = w0[0]; w[ 0] = w0[0];
@ -300,7 +309,7 @@ __kernel void m11500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w[14] = 0; w[14] = 0;
w[15] = 0; w[15] = 0;
u32x a = crc32_VV (w, out_len, iv); u32x a = crc32 (w, out_len, iv);
u32x b = 0; u32x b = 0;
u32x c = 0; u32x c = 0;
u32x d = 0; u32x d = 0;

393
OpenCL/m11500_a1.cl
View File

@ -5,6 +5,9 @@
#define _CRC32_ #define _CRC32_
//incompatible because of branches
//#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -16,9 +19,7 @@
#include "include/kernel_functions.c" #include "include/kernel_functions.c"
#include "OpenCL/types_ocl.c" #include "OpenCL/types_ocl.c"
#include "OpenCL/common.c" #include "OpenCL/common.c"
#include "OpenCL/simd.c"
#define COMPARE_S "OpenCL/check_single_comp4.c"
#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 crc32tab[0x100] = __constant u32 crc32tab[0x100] =
{ {
@ -88,22 +89,32 @@ __constant u32 crc32tab[0x100] =
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
}; };
static u32 round_crc32 (u32 a, const u32 v) static u32x round_crc32 (u32x a, const u32x v)
{ {
const u32 k = (a ^ v) & 0xff; const u32x k = (a ^ v) & 0xff;
const u32 s = a >> 8; const u32x s = a >> 8;
a = crc32tab[k]; #if VECT_SIZE == 1
a = (u32x) crc32tab[k];
#elif VECT_SIZE == 2
a = (u32x) (crc32tab[k.s0], crc32tab[k.s1]);
#elif VECT_SIZE == 4
a = (u32x) (crc32tab[k.s0], crc32tab[k.s1], crc32tab[k.s2], crc32tab[k.s3]);
#elif VECT_SIZE == 8
a = (u32x) (crc32tab[k.s0], crc32tab[k.s1], crc32tab[k.s2], crc32tab[k.s3], crc32tab[k.s4], crc32tab[k.s5], crc32tab[k.s6], crc32tab[k.s7]);
#elif VECT_SIZE == 16
a = (u32x) (crc32tab[k.s0], crc32tab[k.s1], crc32tab[k.s2], crc32tab[k.s3], crc32tab[k.s4], crc32tab[k.s5], crc32tab[k.s6], crc32tab[k.s7], crc32tab[k.s8], crc32tab[k.s9], crc32tab[k.sa], crc32tab[k.sb], crc32tab[k.sc], crc32tab[k.sd], crc32tab[k.se], crc32tab[k.sf]);
#endif
a ^= s; a ^= s;
return a; return a;
} }
static u32 crc32 (const u32 w[16], const u32 pw_len, const u32 iv) static u32x crc32 (const u32x w[16], const u32 pw_len, const u32 iv)
{ {
u32 a = iv ^ ~0; u32x a = iv ^ ~0;
if (pw_len >= 1) a = round_crc32 (a, w[0] >> 0); if (pw_len >= 1) a = round_crc32 (a, w[0] >> 0);
if (pw_len >= 2) a = round_crc32 (a, w[0] >> 8); if (pw_len >= 2) a = round_crc32 (a, w[0] >> 8);
@ -129,12 +140,6 @@ __kernel void m11500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
/**
* digest
*/
const u32 iv = salt_bufs[salt_pos].salt_buf[0];
/** /**
* base * base
*/ */
@ -143,112 +148,128 @@ __kernel void m11500_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 wordl0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
wordl0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[0];
wordl0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[1];
wordl0[2] = pws[gid].i[ 2]; pw_buf0[2] = pws[gid].i[2];
wordl0[3] = pws[gid].i[ 3]; pw_buf0[3] = pws[gid].i[3];
pw_buf1[0] = pws[gid].i[4];
u32 wordl1[4]; pw_buf1[1] = pws[gid].i[5];
pw_buf1[2] = pws[gid].i[6];
wordl1[0] = pws[gid].i[ 4]; pw_buf1[3] = pws[gid].i[7];
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;
const u32 pw_l_len = pws[gid].pw_len; const u32 pw_l_len = pws[gid].pw_len;
if (combs_mode == COMBINATOR_MODE_BASE_RIGHT) /**
{ * salt
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len); */
}
const u32 iv = salt_bufs[salt_pos].salt_buf[0];
/** /**
* loop * 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]; u32x wordl0[4] = { 0 };
wordr0[1] = combs_buf[il_pos].i[1]; u32x wordl1[4] = { 0 };
wordr0[2] = combs_buf[il_pos].i[2]; u32x wordl2[4] = { 0 };
wordr0[3] = combs_buf[il_pos].i[3]; 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]; u32x wordr0[4] = { 0 };
wordr1[1] = combs_buf[il_pos].i[5]; u32x wordr1[4] = { 0 };
wordr1[2] = combs_buf[il_pos].i[6]; u32x wordr2[4] = { 0 };
wordr1[3] = combs_buf[il_pos].i[7]; u32x wordr3[4] = { 0 };
u32 wordr2[4]; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr2[0] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr2[1] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr2[2] = 0; wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
wordr2[3] = 0; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
u32 wordr3[4]; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
wordr3[0] = 0;
wordr3[1] = 0;
wordr3[2] = 0;
wordr3[3] = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT) 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 w_t[16]; u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w_t[ 0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w_t[ 1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w_t[ 2] = wordl0[2] | wordr0[2]; w0[2] = wordl0[2] | wordr0[2];
w_t[ 3] = wordl0[3] | wordr0[3]; w0[3] = wordl0[3] | wordr0[3];
w_t[ 4] = wordl1[0] | wordr1[0]; w1[0] = wordl1[0] | wordr1[0];
w_t[ 5] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w_t[ 6] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w_t[ 7] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
w_t[ 8] = wordl2[0] | wordr2[0]; w2[0] = wordl2[0] | wordr2[0];
w_t[ 9] = wordl2[1] | wordr2[1]; w2[1] = wordl2[1] | wordr2[1];
w_t[10] = wordl2[2] | wordr2[2]; w2[2] = wordl2[2] | wordr2[2];
w_t[11] = wordl2[3] | wordr2[3]; w2[3] = wordl2[3] | wordr2[3];
w_t[12] = wordl3[0] | wordr3[0]; w3[0] = wordl3[0] | wordr3[0];
w_t[13] = wordl3[1] | wordr3[1]; w3[1] = wordl3[1] | wordr3[1];
w_t[14] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w_t[15] = 0; w3[3] = wordl3[3] | wordr3[3];
u32 a = crc32 (w_t, pw_len, iv); /**
u32 b = 0; * crc32
*/
const u32 r0 = a; u32x w[16];
const u32 r1 = b;
const u32 r2 = 0;
const u32 r3 = 0;
#include COMPARE_M w[ 0] = w0[0];
w[ 1] = w0[1];
w[ 2] = w0[2];
w[ 3] = w0[3];
w[ 4] = w1[0];
w[ 5] = w1[1];
w[ 6] = w1[2];
w[ 7] = w1[3];
w[ 8] = w2[0];
w[ 9] = w2[1];
w[10] = w2[2];
w[11] = w2[3];
w[12] = w3[0];
w[13] = w3[1];
w[14] = w3[2];
w[15] = w3[3];
u32x a = crc32 (w, pw_len, iv);
u32x b = 0;
u32x c = 0;
u32x d = 0;
COMPARE_M_SIMD (a, b, c, d);
} }
} }
@ -276,47 +297,30 @@ __kernel void m11500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
if (gid >= gid_max) return; if (gid >= gid_max) return;
u32 wordl0[4]; u32 pw_buf0[4];
u32 pw_buf1[4];
wordl0[0] = pws[gid].i[ 0]; pw_buf0[0] = pws[gid].i[0];
wordl0[1] = pws[gid].i[ 1]; pw_buf0[1] = pws[gid].i[1];
wordl0[2] = pws[gid].i[ 2]; pw_buf0[2] = pws[gid].i[2];
wordl0[3] = pws[gid].i[ 3]; pw_buf0[3] = pws[gid].i[3];
pw_buf1[0] = pws[gid].i[4];
u32 wordl1[4]; pw_buf1[1] = pws[gid].i[5];
pw_buf1[2] = pws[gid].i[6];
wordl1[0] = pws[gid].i[ 4]; pw_buf1[3] = pws[gid].i[7];
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;
const u32 pw_l_len = pws[gid].pw_len; const u32 pw_l_len = pws[gid].pw_len;
if (combs_mode == COMBINATOR_MODE_BASE_RIGHT) /**
{ * salt
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len); */
}
const u32 iv = salt_bufs[salt_pos].salt_buf[0];
/** /**
* digest * digest
*/ */
const u32 iv = salt_bufs[salt_pos].salt_buf[0];
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
@ -329,73 +333,104 @@ __kernel void m11500_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* loop * 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]; u32x wordl0[4] = { 0 };
wordr0[1] = combs_buf[il_pos].i[1]; u32x wordl1[4] = { 0 };
wordr0[2] = combs_buf[il_pos].i[2]; u32x wordl2[4] = { 0 };
wordr0[3] = combs_buf[il_pos].i[3]; 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]; u32x wordr0[4] = { 0 };
wordr1[1] = combs_buf[il_pos].i[5]; u32x wordr1[4] = { 0 };
wordr1[2] = combs_buf[il_pos].i[6]; u32x wordr2[4] = { 0 };
wordr1[3] = combs_buf[il_pos].i[7]; u32x wordr3[4] = { 0 };
u32 wordr2[4]; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr2[0] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr2[1] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr2[2] = 0; wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
wordr2[3] = 0; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
u32 wordr3[4]; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
wordr3[0] = 0;
wordr3[1] = 0;
wordr3[2] = 0;
wordr3[3] = 0;
if (combs_mode == COMBINATOR_MODE_BASE_LEFT) 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 w_t[16]; u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w_t[ 0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w_t[ 1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w_t[ 2] = wordl0[2] | wordr0[2]; w0[2] = wordl0[2] | wordr0[2];
w_t[ 3] = wordl0[3] | wordr0[3]; w0[3] = wordl0[3] | wordr0[3];
w_t[ 4] = wordl1[0] | wordr1[0]; w1[0] = wordl1[0] | wordr1[0];
w_t[ 5] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w_t[ 6] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w_t[ 7] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
w_t[ 8] = wordl2[0] | wordr2[0]; w2[0] = wordl2[0] | wordr2[0];
w_t[ 9] = wordl2[1] | wordr2[1]; w2[1] = wordl2[1] | wordr2[1];
w_t[10] = wordl2[2] | wordr2[2]; w2[2] = wordl2[2] | wordr2[2];
w_t[11] = wordl2[3] | wordr2[3]; w2[3] = wordl2[3] | wordr2[3];
w_t[12] = wordl3[0] | wordr3[0]; w3[0] = wordl3[0] | wordr3[0];
w_t[13] = wordl3[1] | wordr3[1]; w3[1] = wordl3[1] | wordr3[1];
w_t[14] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w_t[15] = 0; w3[3] = wordl3[3] | wordr3[3];
u32 a = crc32 (w_t, pw_len, iv); /**
u32 b = 0; * crc32
*/
const u32 r0 = a; u32x w[16];
const u32 r1 = b;
const u32 r2 = 0;
const u32 r3 = 0;
#include COMPARE_S w[ 0] = w0[0];
w[ 1] = w0[1];
w[ 2] = w0[2];
w[ 3] = w0[3];
w[ 4] = w1[0];
w[ 5] = w1[1];
w[ 6] = w1[2];
w[ 7] = w1[3];
w[ 8] = w2[0];
w[ 9] = w2[1];
w[10] = w2[2];
w[11] = w2[3];
w[12] = w3[0];
w[13] = w3[1];
w[14] = w3[2];
w[15] = w3[3];
u32x a = crc32 (w, pw_len, iv);
u32x b = 0;
u32x c = 0;
u32x d = 0;
COMPARE_S_SIMD (a, b, c, d);
} }
} }

19
OpenCL/m11500_a3.cl
View File

@ -7,7 +7,8 @@
#define _CRC32_ #define _CRC32_
#define NEW_SIMD_CODE //incompatible because of branches
//#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -143,7 +144,7 @@ static void m11500m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
/** /**
* digest * salt
*/ */
const u32 iv = salt_bufs[salt_pos].salt_buf[0]; const u32 iv = salt_bufs[salt_pos].salt_buf[0];
@ -160,6 +161,10 @@ static void m11500m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
const u32x w0 = w0l | w0r; const u32x w0 = w0l | w0r;
/**
* crc32
*/
u32x w_t[16]; u32x w_t[16];
w_t[ 0] = w0; w_t[ 0] = w0;
@ -198,11 +203,15 @@ static void m11500s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
/** /**
* digest * salt
*/ */
const u32 iv = salt_bufs[salt_pos].salt_buf[0]; const u32 iv = salt_bufs[salt_pos].salt_buf[0];
/**
* digest
*/
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
@ -223,6 +232,10 @@ static void m11500s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
const u32x w0 = w0l | w0r; const u32x w0 = w0l | w0r;
/**
* crc32
*/
u32x w_t[16]; u32x w_t[16];
w_t[ 0] = w0; w_t[ 0] = w0;