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

Cleanup -m 87xx kernels to latest standard

Browse Source
This commit is contained in:
Jens Steube 2016-04-16 17:55:09 +02:00
parent 4f44f2b9e9
commit ac05a163e7
3 changed files with 293 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenCL/m08700_a0.cl
View File

@ -317,14 +317,12 @@ __kernel void m08700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
*/ */
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];
@ -352,6 +350,10 @@ __kernel void m08700_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);
/**
* domino
*/
u32x w[16]; u32x w[16];
w[ 0] = w0[0]; w[ 0] = w0[0];
@ -502,14 +504,12 @@ __kernel void m08700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
*/ */
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];
@ -549,6 +549,10 @@ __kernel void m08700_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);
/**
* domino
*/
u32x w[16]; u32x w[16];
w[ 0] = w0[0]; w[ 0] = w0[0];

511
OpenCL/m08700_a1.cl
View File

@ -7,6 +7,9 @@
#define _LOTUS6_ #define _LOTUS6_
//incompatible
//#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -18,9 +21,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 lotus_magic_table[256] = __constant u32 lotus_magic_table[256] =
{ {
@ -58,64 +59,84 @@ __constant u32 lotus_magic_table[256] =
0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab, 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab,
}; };
#define BOX(S,i) (S)[(i)] #if VECT_SIZE == 1
#define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)])
#elif VECT_SIZE == 2
#define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1])
#elif VECT_SIZE == 4
#define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3])
#elif VECT_SIZE == 8
#define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7])
#elif VECT_SIZE == 16
#define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
#endif
#define uint_to_hex_upper8(i) l_bin2asc[(i)] #if VECT_SIZE == 1
#define BOX1(S,i) (S)[(i)]
#elif VECT_SIZE == 2
#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1])
#elif VECT_SIZE == 4
#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3])
#elif VECT_SIZE == 8
#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7])
#elif VECT_SIZE == 16
#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf])
#endif
static void lotus_mix (u32 *in, __local u32 *s_lotus_magic_table) static void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table)
{ {
u32 p = 0; u32x p = 0;
for (int i = 0; i < 18; i++) for (int i = 0; i < 18; i++)
{ {
u32 s = 48; u32 s = 48;
#pragma unroll #pragma unroll 12
for (int j = 0; j < 12; j++) for (int j = 0; j < 12; j++)
{ {
u32 tmp_in = in[j]; u32x tmp_in = in[j];
u32 tmp_out = 0; u32x tmp_out = 0;
p = (p + s--) & 0xff; p = ((tmp_in >> 0) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 0; p = (p + s--) & 0xff; p = ((tmp_in >> 0) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 0;
p = (p + s--) & 0xff; p = ((tmp_in >> 8) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 8; p = (p + s--) & 0xff; p = ((tmp_in >> 8) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 8;
p = (p + s--) & 0xff; p = ((tmp_in >> 16) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 16; p = (p + s--) & 0xff; p = ((tmp_in >> 16) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 16;
p = (p + s--) & 0xff; p = ((tmp_in >> 24) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 24; p = (p + s--) & 0xff; p = ((tmp_in >> 24) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 24;
in[j] = tmp_out; in[j] = tmp_out;
} }
} }
} }
static void lotus_transform_password (u32 in[4], u32 out[4], __local u32 *s_lotus_magic_table) static void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_magic_table)
{ {
u32 t = out[3] >> 24; u32x t = out[3] >> 24;
u32 c; u32x c;
//#pragma unroll // kernel fails if used #pragma unroll 4
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
t ^= (in[i] >> 0) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 0; t = ((out[i] >> 0) & 0xff); t ^= (in[i] >> 0) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 0; t = ((out[i] >> 0) & 0xff);
t ^= (in[i] >> 8) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 8; t = ((out[i] >> 8) & 0xff); t ^= (in[i] >> 8) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 8; t = ((out[i] >> 8) & 0xff);
t ^= (in[i] >> 16) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 16; t = ((out[i] >> 16) & 0xff); t ^= (in[i] >> 16) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 16; t = ((out[i] >> 16) & 0xff);
t ^= (in[i] >> 24) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 24; t = ((out[i] >> 24) & 0xff); t ^= (in[i] >> 24) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 24; t = ((out[i] >> 24) & 0xff);
} }
} }
static void pad (u32 w[4], const u32 len) static void pad (u32x w[4], const u32 len)
{ {
const u32 val = 16 - len; const u32 val = 16 - len;
const u32 mask1 = val << 24; const u32x mask1 = val << 24;
const u32 mask2 = val << 16 const u32x mask2 = val << 16
| val << 24; | val << 24;
const u32 mask3 = val << 8 const u32x mask3 = val << 8
| val << 16 | val << 16
| val << 24; | val << 24;
const u32 mask4 = val << 0 const u32x mask4 = val << 0
| val << 8 | val << 8
| val << 16 | val << 16
| val << 24; | val << 24;
@ -181,9 +202,9 @@ static void pad (u32 w[4], const u32 len)
} }
} }
static void mdtransform_norecalc (u32 state[4], u32 block[4], __local u32 *s_lotus_magic_table) static void mdtransform_norecalc (u32x state[4], u32x block[4], __local u32 *s_lotus_magic_table)
{ {
u32 x[12]; u32x x[12];
x[ 0] = state[0]; x[ 0] = state[0];
x[ 1] = state[1]; x[ 1] = state[1];
@ -206,23 +227,23 @@ static void mdtransform_norecalc (u32 state[4], u32 block[4], __local u32 *s_lot
state[3] = x[3]; state[3] = x[3];
} }
static void mdtransform (u32 state[4], u32 checksum[4], u32 block[4], __local u32 *s_lotus_magic_table) static void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s_lotus_magic_table)
{ {
mdtransform_norecalc (state, block, s_lotus_magic_table); mdtransform_norecalc (state, block, s_lotus_magic_table);
lotus_transform_password (block, checksum, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table);
} }
static void domino_big_md (const u32 saved_key[16], const u32 size, u32 state[4], __local u32 *s_lotus_magic_table) static void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table)
{ {
u32 checksum[4]; u32x checksum[4];
checksum[0] = 0; checksum[0] = 0;
checksum[1] = 0; checksum[1] = 0;
checksum[2] = 0; checksum[2] = 0;
checksum[3] = 0; checksum[3] = 0;
u32 block[4]; u32x block[4];
block[0] = 0; block[0] = 0;
block[1] = 0; block[1] = 0;
@ -292,41 +313,20 @@ __kernel void m08700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* base * base
*/ */
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)
{
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
}
/** /**
* salt * salt
*/ */
@ -338,65 +338,99 @@ __kernel void m08700_m04 (__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[16]; u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w[ 0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w[ 1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w[ 2] = wordl0[2] | wordr0[2]; w0[2] = wordl0[2] | wordr0[2];
w[ 3] = wordl0[3] | wordr0[3]; w0[3] = wordl0[3] | wordr0[3];
w[ 4] = wordl1[0] | wordr1[0]; w1[0] = wordl1[0] | wordr1[0];
w[ 5] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w[ 6] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w[ 7] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
w[ 8] = wordl2[0] | wordr2[0]; w2[0] = wordl2[0] | wordr2[0];
w[ 9] = wordl2[1] | wordr2[1]; w2[1] = wordl2[1] | wordr2[1];
w[10] = wordl2[2] | wordr2[2]; w2[2] = wordl2[2] | wordr2[2];
w[11] = wordl2[3] | wordr2[3]; w2[3] = wordl2[3] | wordr2[3];
w[12] = wordl3[0] | wordr3[0]; w3[0] = wordl3[0] | wordr3[0];
w[13] = wordl3[1] | wordr3[1]; w3[1] = wordl3[1] | wordr3[1];
w[14] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w[15] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
u32 state[4]; /**
* domino
*/
u32x w[16];
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 state[4];
state[0] = 0; state[0] = 0;
state[1] = 0; state[1] = 0;
@ -426,22 +460,22 @@ __kernel void m08700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
domino_big_md (w, pw_len, state, s_lotus_magic_table); domino_big_md (w, pw_len, state, s_lotus_magic_table);
const u32 w0_t = uint_to_hex_upper8 ((state[0] >> 0) & 255) << 0 const u32x w0_t = uint_to_hex_upper8 ((state[0] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[0] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[0] >> 8) & 255) << 16;
const u32 w1_t = uint_to_hex_upper8 ((state[0] >> 16) & 255) << 0 const u32x w1_t = uint_to_hex_upper8 ((state[0] >> 16) & 255) << 0
| uint_to_hex_upper8 ((state[0] >> 24) & 255) << 16; | uint_to_hex_upper8 ((state[0] >> 24) & 255) << 16;
const u32 w2_t = uint_to_hex_upper8 ((state[1] >> 0) & 255) << 0 const u32x w2_t = uint_to_hex_upper8 ((state[1] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[1] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[1] >> 8) & 255) << 16;
const u32 w3_t = uint_to_hex_upper8 ((state[1] >> 16) & 255) << 0 const u32x w3_t = uint_to_hex_upper8 ((state[1] >> 16) & 255) << 0
| uint_to_hex_upper8 ((state[1] >> 24) & 255) << 16; | uint_to_hex_upper8 ((state[1] >> 24) & 255) << 16;
const u32 w4_t = uint_to_hex_upper8 ((state[2] >> 0) & 255) << 0 const u32x w4_t = uint_to_hex_upper8 ((state[2] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[2] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[2] >> 8) & 255) << 16;
const u32 w5_t = uint_to_hex_upper8 ((state[2] >> 16) & 255) << 0 const u32x w5_t = uint_to_hex_upper8 ((state[2] >> 16) & 255) << 0
| uint_to_hex_upper8 ((state[2] >> 24) & 255) << 16; | uint_to_hex_upper8 ((state[2] >> 24) & 255) << 16;
const u32 w6_t = uint_to_hex_upper8 ((state[3] >> 0) & 255) << 0 const u32x w6_t = uint_to_hex_upper8 ((state[3] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[3] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[3] >> 8) & 255) << 16;
//const u32 w7_t = uint_to_hex_upper8 ((state[3] >> 16) & 255) << 0 //const u32x w7_t = uint_to_hex_upper8 ((state[3] >> 16) & 255) << 0
// | uint_to_hex_upper8 ((state[3] >> 24) & 255) << 16; // | uint_to_hex_upper8 ((state[3] >> 24) & 255) << 16;
const u32 pade = 0x0e0e0e0e; const u32 pade = 0x0e0e0e0e;
@ -469,17 +503,12 @@ __kernel void m08700_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
domino_big_md (w, 34, state, s_lotus_magic_table); domino_big_md (w, 34, state, s_lotus_magic_table);
u32 a = state[0] & 0xffffffff; u32x a = state[0] & 0xffffffff;
u32 b = state[1] & 0xffffffff; u32x b = state[1] & 0xffffffff;
u32 c = state[2] & 0x000000ff; u32x c = state[2] & 0x000000ff;
u32 d = state[3] & 0x00000000; u32x d = state[3] & 0x00000000;
const u32 r0 = a; COMPARE_M_SIMD (a, b, c, d);
const u32 r1 = b;
const u32 r2 = c;
const u32 r3 = d;
#include COMPARE_M
} }
} }
@ -531,41 +560,20 @@ __kernel void m08700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* base * base
*/ */
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)
{
switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
}
/** /**
* salt * salt
*/ */
@ -589,65 +597,99 @@ __kernel void m08700_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[16]; u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w[ 0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w[ 1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w[ 2] = wordl0[2] | wordr0[2]; w0[2] = wordl0[2] | wordr0[2];
w[ 3] = wordl0[3] | wordr0[3]; w0[3] = wordl0[3] | wordr0[3];
w[ 4] = wordl1[0] | wordr1[0]; w1[0] = wordl1[0] | wordr1[0];
w[ 5] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w[ 6] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w[ 7] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
w[ 8] = wordl2[0] | wordr2[0]; w2[0] = wordl2[0] | wordr2[0];
w[ 9] = wordl2[1] | wordr2[1]; w2[1] = wordl2[1] | wordr2[1];
w[10] = wordl2[2] | wordr2[2]; w2[2] = wordl2[2] | wordr2[2];
w[11] = wordl2[3] | wordr2[3]; w2[3] = wordl2[3] | wordr2[3];
w[12] = wordl3[0] | wordr3[0]; w3[0] = wordl3[0] | wordr3[0];
w[13] = wordl3[1] | wordr3[1]; w3[1] = wordl3[1] | wordr3[1];
w[14] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w[15] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
u32 state[4]; /**
* domino
*/
u32x w[16];
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 state[4];
state[0] = 0; state[0] = 0;
state[1] = 0; state[1] = 0;
@ -677,22 +719,22 @@ __kernel void m08700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
domino_big_md (w, pw_len, state, s_lotus_magic_table); domino_big_md (w, pw_len, state, s_lotus_magic_table);
const u32 w0_t = uint_to_hex_upper8 ((state[0] >> 0) & 255) << 0 const u32x w0_t = uint_to_hex_upper8 ((state[0] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[0] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[0] >> 8) & 255) << 16;
const u32 w1_t = uint_to_hex_upper8 ((state[0] >> 16) & 255) << 0 const u32x w1_t = uint_to_hex_upper8 ((state[0] >> 16) & 255) << 0
| uint_to_hex_upper8 ((state[0] >> 24) & 255) << 16; | uint_to_hex_upper8 ((state[0] >> 24) & 255) << 16;
const u32 w2_t = uint_to_hex_upper8 ((state[1] >> 0) & 255) << 0 const u32x w2_t = uint_to_hex_upper8 ((state[1] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[1] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[1] >> 8) & 255) << 16;
const u32 w3_t = uint_to_hex_upper8 ((state[1] >> 16) & 255) << 0 const u32x w3_t = uint_to_hex_upper8 ((state[1] >> 16) & 255) << 0
| uint_to_hex_upper8 ((state[1] >> 24) & 255) << 16; | uint_to_hex_upper8 ((state[1] >> 24) & 255) << 16;
const u32 w4_t = uint_to_hex_upper8 ((state[2] >> 0) & 255) << 0 const u32x w4_t = uint_to_hex_upper8 ((state[2] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[2] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[2] >> 8) & 255) << 16;
const u32 w5_t = uint_to_hex_upper8 ((state[2] >> 16) & 255) << 0 const u32x w5_t = uint_to_hex_upper8 ((state[2] >> 16) & 255) << 0
| uint_to_hex_upper8 ((state[2] >> 24) & 255) << 16; | uint_to_hex_upper8 ((state[2] >> 24) & 255) << 16;
const u32 w6_t = uint_to_hex_upper8 ((state[3] >> 0) & 255) << 0 const u32x w6_t = uint_to_hex_upper8 ((state[3] >> 0) & 255) << 0
| uint_to_hex_upper8 ((state[3] >> 8) & 255) << 16; | uint_to_hex_upper8 ((state[3] >> 8) & 255) << 16;
//const u32 w7_t = uint_to_hex_upper8 ((state[3] >> 16) & 255) << 0 //const u32x w7_t = uint_to_hex_upper8 ((state[3] >> 16) & 255) << 0
// | uint_to_hex_upper8 ((state[3] >> 24) & 255) << 16; // | uint_to_hex_upper8 ((state[3] >> 24) & 255) << 16;
const u32 pade = 0x0e0e0e0e; const u32 pade = 0x0e0e0e0e;
@ -720,17 +762,12 @@ __kernel void m08700_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
domino_big_md (w, 34, state, s_lotus_magic_table); domino_big_md (w, 34, state, s_lotus_magic_table);
u32 a = state[0] & 0xffffffff; u32x a = state[0] & 0xffffffff;
u32 b = state[1] & 0xffffffff; u32x b = state[1] & 0xffffffff;
u32 c = state[2] & 0x000000ff; u32x c = state[2] & 0x000000ff;
u32 d = state[3] & 0x00000000; u32x d = state[3] & 0x00000000;
const u32 r0 = a; COMPARE_S_SIMD (a, b, c, d);
const u32 r1 = b;
const u32 r2 = c;
const u32 r3 = d;
#include COMPARE_S
} }
} }

10
OpenCL/m08700_a3.cl
View File

@ -285,7 +285,7 @@ static void m08700m (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, u
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
/** /**
* padding * base
*/ */
if (pw_len < 16) if (pw_len < 16)
@ -324,6 +324,10 @@ static void m08700m (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, u
const u32x w0 = w0l | w0r; const u32x w0 = w0l | w0r;
/**
* domino
*/
u32x w_tmp[16]; u32x w_tmp[16];
w_tmp[ 0] = w0; w_tmp[ 0] = w0;
@ -465,6 +469,10 @@ static void m08700s (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, u
const u32x w0 = w0l | w0r; const u32x w0 = w0l | w0r;
/**
* domino
*/
u32x w_tmp[16]; u32x w_tmp[16];
w_tmp[ 0] = w0; w_tmp[ 0] = w0;