arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00
Code Issues Releases Wiki Activity

Cleanup -m 48xx kernels to latest standard

Browse Source
This commit is contained in:
Jens Steube 2016-04-10 20:38:35 +02:00
parent 029601795a
commit 6b2a3e7b27
3 changed files with 423 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
OpenCL/m04800_a0.cl
View File

@ -28,29 +28,26 @@ __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* modifier * modifier
*/ */
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
if (gid >= gid_max) return;
/** /**
* base * base
*/ */
const u32 gid = get_global_id (0);
if (gid >= gid_max) return;
u32 pw_buf0[4]; u32 pw_buf0[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]; u32 pw_buf1[4];
pw_buf1[0] = pws[gid].i[ 4]; pw_buf0[0] = pws[gid].i[0];
pw_buf1[1] = pws[gid].i[ 5]; pw_buf0[1] = pws[gid].i[1];
pw_buf1[2] = pws[gid].i[ 6]; pw_buf0[2] = pws[gid].i[2];
pw_buf1[3] = pws[gid].i[ 7]; 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_len = pws[gid].pw_len; const u32 pw_len = pws[gid].pw_len;
@ -81,35 +78,29 @@ __kernel void m04800_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);
u32x pw_salt_len = out_len + salt_len; const u32x salt_out_len = salt_len + out_len;
/** /**
* append salt * append salt
*/ */
u32x s0[4]; u32x s0[4];
u32x s1[4];
u32x s2[4];
u32x s3[4];
s0[0] = salt_buf[0]; s0[0] = salt_buf[0];
s0[1] = salt_buf[1]; s0[1] = salt_buf[1];
s0[2] = salt_buf[2]; s0[2] = salt_buf[2];
s0[3] = salt_buf[3]; s0[3] = salt_buf[3];
u32x s1[4];
s1[0] = 0x80; s1[0] = 0x80;
s1[1] = 0; s1[1] = 0;
s1[2] = 0; s1[2] = 0;
s1[3] = 0; s1[3] = 0;
u32x s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32x s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
@ -121,23 +112,20 @@ __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0[1] |= s0[1]; w0[1] |= s0[1];
w0[2] |= s0[2]; w0[2] |= s0[2];
w0[3] |= s0[3]; w0[3] |= s0[3];
w1[0] |= s1[0]; w1[0] |= s1[0];
w1[1] |= s1[1]; w1[1] |= s1[1];
w1[2] |= s1[2]; w1[2] |= s1[2];
w1[3] |= s1[3]; w1[3] |= s1[3];
w2[0] |= s2[0]; w2[0] |= s2[0];
w2[1] |= s2[1]; w2[1] |= s2[1];
w2[2] |= s2[2]; w2[2] |= s2[2];
w2[3] |= s2[3]; w2[3] |= s2[3];
w3[0] |= s3[0]; w3[0] |= s3[0];
w3[1] |= s3[1]; w3[1] |= s3[1];
w3[2] = 0; w3[2] |= s3[2];
w3[3] = 0; w3[3] |= s3[3];
/* /**
* add id byte * add id byte
*/ */
@ -145,7 +133,8 @@ __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0[0] |= salt_buf[4]; w0[0] |= salt_buf[4];
w3[2] = pw_salt_len * 8; w3[2] = salt_out_len * 8;
w3[3] = 0;
/** /**
* md5 * md5
@ -242,29 +231,26 @@ __kernel void m04800_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* modifier * modifier
*/ */
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
if (gid >= gid_max) return;
/** /**
* base * base
*/ */
const u32 gid = get_global_id (0);
if (gid >= gid_max) return;
u32 pw_buf0[4]; u32 pw_buf0[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]; u32 pw_buf1[4];
pw_buf1[0] = pws[gid].i[ 4]; pw_buf0[0] = pws[gid].i[0];
pw_buf1[1] = pws[gid].i[ 5]; pw_buf0[1] = pws[gid].i[1];
pw_buf1[2] = pws[gid].i[ 6]; pw_buf0[2] = pws[gid].i[2];
pw_buf1[3] = pws[gid].i[ 7]; 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_len = pws[gid].pw_len; const u32 pw_len = pws[gid].pw_len;
@ -307,35 +293,29 @@ __kernel void m04800_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);
u32x pw_salt_len = out_len + salt_len; const u32x salt_out_len = salt_len + out_len;
/** /**
* append salt * append salt
*/ */
u32x s0[4]; u32x s0[4];
u32x s1[4];
u32x s2[4];
u32x s3[4];
s0[0] = salt_buf[0]; s0[0] = salt_buf[0];
s0[1] = salt_buf[1]; s0[1] = salt_buf[1];
s0[2] = salt_buf[2]; s0[2] = salt_buf[2];
s0[3] = salt_buf[3]; s0[3] = salt_buf[3];
u32x s1[4];
s1[0] = 0x80; s1[0] = 0x80;
s1[1] = 0; s1[1] = 0;
s1[2] = 0; s1[2] = 0;
s1[3] = 0; s1[3] = 0;
u32x s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32x s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
@ -347,23 +327,20 @@ __kernel void m04800_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0[1] |= s0[1]; w0[1] |= s0[1];
w0[2] |= s0[2]; w0[2] |= s0[2];
w0[3] |= s0[3]; w0[3] |= s0[3];
w1[0] |= s1[0]; w1[0] |= s1[0];
w1[1] |= s1[1]; w1[1] |= s1[1];
w1[2] |= s1[2]; w1[2] |= s1[2];
w1[3] |= s1[3]; w1[3] |= s1[3];
w2[0] |= s2[0]; w2[0] |= s2[0];
w2[1] |= s2[1]; w2[1] |= s2[1];
w2[2] |= s2[2]; w2[2] |= s2[2];
w2[3] |= s2[3]; w2[3] |= s2[3];
w3[0] |= s3[0]; w3[0] |= s3[0];
w3[1] |= s3[1]; w3[1] |= s3[1];
w3[2] = 0; w3[2] |= s3[2];
w3[3] = 0; w3[3] |= s3[3];
/* /**
* add id byte * add id byte
*/ */
@ -371,7 +348,8 @@ __kernel void m04800_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w0[0] |= salt_buf[4]; w0[0] |= salt_buf[4];
w3[2] = pw_salt_len * 8; w3[2] = salt_out_len * 8;
w3[3] = 0;
/** /**
* md5 * md5

380
OpenCL/m04800_a1.cl
View File

@ -5,6 +5,8 @@
#define _MD5_ #define _MD5_
#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -16,9 +18,19 @@
#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" #if VECT_SIZE == 1
#define COMPARE_M "OpenCL/check_multi_comp4.c" #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)])
#elif VECT_SIZE == 2
#define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1])
#elif VECT_SIZE == 4
#define uint_to_hex_lower8_le(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_lower8_le(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_lower8_le(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
__kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{ {
@ -26,51 +38,29 @@ __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* modifier * modifier
*/ */
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
if (gid >= gid_max) return;
/** /**
* base * base
*/ */
const u32 gid = get_global_id (0); u32 pw_buf0[4];
u32 pw_buf1[4];
if (gid >= gid_max) return; pw_buf0[0] = pws[gid].i[0];
pw_buf0[1] = pws[gid].i[1];
u32 wordl0[4]; pw_buf0[2] = pws[gid].i[2];
pw_buf0[3] = pws[gid].i[3];
wordl0[0] = pws[gid].i[ 0]; pw_buf1[0] = pws[gid].i[4];
wordl0[1] = pws[gid].i[ 1]; pw_buf1[1] = pws[gid].i[5];
wordl0[2] = pws[gid].i[ 2]; pw_buf1[2] = pws[gid].i[6];
wordl0[3] = pws[gid].i[ 3]; pw_buf1[3] = pws[gid].i[7];
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;
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
*/ */
@ -89,116 +79,104 @@ __kernel void m04800_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]; const u32x pw_salt_len = pw_len + salt_len;
wordr0[0] = combs_buf[il_pos].i[0]; /**
wordr0[1] = combs_buf[il_pos].i[1]; * concat password candidate
wordr0[2] = combs_buf[il_pos].i[2]; */
wordr0[3] = combs_buf[il_pos].i[3];
u32 wordr1[4]; u32x wordl0[4] = { 0 };
u32x wordl1[4] = { 0 };
u32x wordl2[4] = { 0 };
u32x wordl3[4] = { 0 };
wordr1[0] = combs_buf[il_pos].i[4]; wordl0[0] = pw_buf0[0];
wordr1[1] = combs_buf[il_pos].i[5]; wordl0[1] = pw_buf0[1];
wordr1[2] = combs_buf[il_pos].i[6]; wordl0[2] = pw_buf0[2];
wordr1[3] = combs_buf[il_pos].i[7]; 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];
u32 wordr2[4]; u32x wordr0[4] = { 0 };
u32x wordr1[4] = { 0 };
u32x wordr2[4] = { 0 };
u32x wordr3[4] = { 0 };
wordr2[0] = 0; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr2[1] = 0; wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr2[2] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr2[3] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
u32 wordr3[4]; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
wordr3[0] = 0; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
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 w0[4]; u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w0[2] = wordl0[2] | wordr0[2]; w0[2] = wordl0[2] | wordr0[2];
w0[3] = wordl0[3] | wordr0[3]; w0[3] = wordl0[3] | wordr0[3];
u32 w1[4];
w1[0] = wordl1[0] | wordr1[0]; w1[0] = wordl1[0] | wordr1[0];
w1[1] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w1[2] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w1[3] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
u32 w2[4];
w2[0] = wordl2[0] | wordr2[0]; w2[0] = wordl2[0] | wordr2[0];
w2[1] = wordl2[1] | wordr2[1]; w2[1] = wordl2[1] | wordr2[1];
w2[2] = wordl2[2] | wordr2[2]; w2[2] = wordl2[2] | wordr2[2];
w2[3] = wordl2[3] | wordr2[3]; w2[3] = wordl2[3] | wordr2[3];
u32 w3[4];
w3[0] = wordl3[0] | wordr3[0]; w3[0] = wordl3[0] | wordr3[0];
w3[1] = wordl3[1] | wordr3[1]; w3[1] = wordl3[1] | wordr3[1];
w3[2] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
/*
* add id byte
*/
switch_buffer_by_offset_le (w0, w1, w2, w3, 1);
w0[0] |= salt_buf[4];
/** /**
* append salt * append salt
*/ */
u32 s0[4]; u32x s0[4];
u32x s1[4];
u32x s2[4];
u32x s3[4];
s0[0] = salt_buf[0]; s0[0] = salt_buf[0];
s0[1] = salt_buf[1]; s0[1] = salt_buf[1];
s0[2] = salt_buf[2]; s0[2] = salt_buf[2];
s0[3] = salt_buf[3]; s0[3] = salt_buf[3];
u32 s1[4];
s1[0] = 0x80; s1[0] = 0x80;
s1[1] = 0; s1[1] = 0;
s1[2] = 0; s1[2] = 0;
s1[3] = 0; s1[3] = 0;
u32 s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
switch_buffer_by_offset_le (s0, s1, s2, s3, 1 + pw_len); switch_buffer_by_offset_le_VV (s0, s1, s2, s3, pw_len);
const u32 pw_salt_len = pw_len + salt_len;
w0[0] |= s0[0]; w0[0] |= s0[0];
w0[1] |= s0[1]; w0[1] |= s0[1];
@ -214,17 +192,28 @@ __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w2[3] |= s2[3]; w2[3] |= s2[3];
w3[0] |= s3[0]; w3[0] |= s3[0];
w3[1] |= s3[1]; w3[1] |= s3[1];
w3[2] = pw_salt_len * 8; w3[2] |= s3[2];
w3[3] = 0; w3[3] |= s3[3];
/*
* add id byte
*/
switch_buffer_by_offset_le (w0, w1, w2, w3, 1);
w0[0] |= salt_buf[4];
w3[2] = pw_salt_len * 8;
w3[3] = 0;
/** /**
* md5 * md5
*/ */
u32 a = MD5M_A; u32x a = MD5M_A;
u32 b = MD5M_B; u32x b = MD5M_B;
u32 c = MD5M_C; u32x c = MD5M_C;
u32 d = MD5M_D; u32x d = MD5M_D;
MD5_STEP (MD5_Fo, a, b, c, d, w0[0], MD5C00, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w0[0], MD5C00, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w0[1], MD5C01, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w0[1], MD5C01, MD5S01);
@ -294,12 +283,7 @@ __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w2[1], MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w2[1], MD5C3f, MD5S33);
const u32 r0 = a; COMPARE_M_SIMD (a, d, c, b);
const u32 r1 = d;
const u32 r2 = c;
const u32 r3 = b;
#include COMPARE_M
} }
} }
@ -317,51 +301,29 @@ __kernel void m04800_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* modifier * modifier
*/ */
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0); const u32 lid = get_local_id (0);
if (gid >= gid_max) return;
/** /**
* base * base
*/ */
const u32 gid = get_global_id (0); u32 pw_buf0[4];
u32 pw_buf1[4];
if (gid >= gid_max) return; pw_buf0[0] = pws[gid].i[0];
pw_buf0[1] = pws[gid].i[1];
u32 wordl0[4]; pw_buf0[2] = pws[gid].i[2];
pw_buf0[3] = pws[gid].i[3];
wordl0[0] = pws[gid].i[ 0]; pw_buf1[0] = pws[gid].i[4];
wordl0[1] = pws[gid].i[ 1]; pw_buf1[1] = pws[gid].i[5];
wordl0[2] = pws[gid].i[ 2]; pw_buf1[2] = pws[gid].i[6];
wordl0[3] = pws[gid].i[ 3]; pw_buf1[3] = pws[gid].i[7];
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;
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
*/ */
@ -392,116 +354,104 @@ __kernel void m04800_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]; const u32x pw_salt_len = pw_len + salt_len;
wordr0[0] = combs_buf[il_pos].i[0]; /**
wordr0[1] = combs_buf[il_pos].i[1]; * concat password candidate
wordr0[2] = combs_buf[il_pos].i[2]; */
wordr0[3] = combs_buf[il_pos].i[3];
u32 wordr1[4]; u32x wordl0[4] = { 0 };
u32x wordl1[4] = { 0 };
u32x wordl2[4] = { 0 };
u32x wordl3[4] = { 0 };
wordr1[0] = combs_buf[il_pos].i[4]; wordl0[0] = pw_buf0[0];
wordr1[1] = combs_buf[il_pos].i[5]; wordl0[1] = pw_buf0[1];
wordr1[2] = combs_buf[il_pos].i[6]; wordl0[2] = pw_buf0[2];
wordr1[3] = combs_buf[il_pos].i[7]; 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];
u32 wordr2[4]; u32x wordr0[4] = { 0 };
u32x wordr1[4] = { 0 };
u32x wordr2[4] = { 0 };
u32x wordr3[4] = { 0 };
wordr2[0] = 0; wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
wordr2[1] = 0; wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
wordr2[2] = 0; wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
wordr2[3] = 0; wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
u32 wordr3[4]; wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
wordr3[0] = 0; wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
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 w0[4]; u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w0[0] = wordl0[0] | wordr0[0]; w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1]; w0[1] = wordl0[1] | wordr0[1];
w0[2] = wordl0[2] | wordr0[2]; w0[2] = wordl0[2] | wordr0[2];
w0[3] = wordl0[3] | wordr0[3]; w0[3] = wordl0[3] | wordr0[3];
u32 w1[4];
w1[0] = wordl1[0] | wordr1[0]; w1[0] = wordl1[0] | wordr1[0];
w1[1] = wordl1[1] | wordr1[1]; w1[1] = wordl1[1] | wordr1[1];
w1[2] = wordl1[2] | wordr1[2]; w1[2] = wordl1[2] | wordr1[2];
w1[3] = wordl1[3] | wordr1[3]; w1[3] = wordl1[3] | wordr1[3];
u32 w2[4];
w2[0] = wordl2[0] | wordr2[0]; w2[0] = wordl2[0] | wordr2[0];
w2[1] = wordl2[1] | wordr2[1]; w2[1] = wordl2[1] | wordr2[1];
w2[2] = wordl2[2] | wordr2[2]; w2[2] = wordl2[2] | wordr2[2];
w2[3] = wordl2[3] | wordr2[3]; w2[3] = wordl2[3] | wordr2[3];
u32 w3[4];
w3[0] = wordl3[0] | wordr3[0]; w3[0] = wordl3[0] | wordr3[0];
w3[1] = wordl3[1] | wordr3[1]; w3[1] = wordl3[1] | wordr3[1];
w3[2] = wordl3[2] | wordr3[2]; w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3]; w3[3] = wordl3[3] | wordr3[3];
/*
* add id byte
*/
switch_buffer_by_offset_le (w0, w1, w2, w3, 1);
w0[0] |= salt_buf[4];
/** /**
* append salt * append salt
*/ */
u32 s0[4]; u32x s0[4];
u32x s1[4];
u32x s2[4];
u32x s3[4];
s0[0] = salt_buf[0]; s0[0] = salt_buf[0];
s0[1] = salt_buf[1]; s0[1] = salt_buf[1];
s0[2] = salt_buf[2]; s0[2] = salt_buf[2];
s0[3] = salt_buf[3]; s0[3] = salt_buf[3];
u32 s1[4];
s1[0] = 0x80; s1[0] = 0x80;
s1[1] = 0; s1[1] = 0;
s1[2] = 0; s1[2] = 0;
s1[3] = 0; s1[3] = 0;
u32 s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
switch_buffer_by_offset_le (s0, s1, s2, s3, 1 + pw_len); switch_buffer_by_offset_le_VV (s0, s1, s2, s3, pw_len);
const u32 pw_salt_len = pw_len + salt_len;
w0[0] |= s0[0]; w0[0] |= s0[0];
w0[1] |= s0[1]; w0[1] |= s0[1];
@ -517,17 +467,28 @@ __kernel void m04800_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w2[3] |= s2[3]; w2[3] |= s2[3];
w3[0] |= s3[0]; w3[0] |= s3[0];
w3[1] |= s3[1]; w3[1] |= s3[1];
w3[2] = pw_salt_len * 8; w3[2] |= s3[2];
w3[3] = 0; w3[3] |= s3[3];
/*
* add id byte
*/
switch_buffer_by_offset_le (w0, w1, w2, w3, 1);
w0[0] |= salt_buf[4];
w3[2] = pw_salt_len * 8;
w3[3] = 0;
/** /**
* md5 * md5
*/ */
u32 a = MD5M_A; u32x a = MD5M_A;
u32 b = MD5M_B; u32x b = MD5M_B;
u32 c = MD5M_C; u32x c = MD5M_C;
u32 d = MD5M_D; u32x d = MD5M_D;
MD5_STEP (MD5_Fo, a, b, c, d, w0[0], MD5C00, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w0[0], MD5C00, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w0[1], MD5C01, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w0[1], MD5C01, MD5S01);
@ -594,20 +555,13 @@ __kernel void m04800_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
MD5_STEP (MD5_I , b, c, d, a, w3[1], MD5C3b, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w3[1], MD5C3b, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w1[0], MD5C3c, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w1[0], MD5C3c, MD5S30);
bool q_cond = allx (search[0] != a); if (MATCHES_NONE_VS (a, search[0])) continue;
if (q_cond) continue;
MD5_STEP (MD5_I , d, a, b, c, w2[3], MD5C3d, MD5S31); MD5_STEP (MD5_I , d, a, b, c, w2[3], MD5C3d, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w2[1], MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w2[1], MD5C3f, MD5S33);
const u32 r0 = a; COMPARE_S_SIMD (a, d, c, b);
const u32 r1 = d;
const u32 r2 = c;
const u32 r3 = b;
#include COMPARE_S
} }
} }

480
OpenCL/m04800_a3.cl
View File

@ -46,106 +46,82 @@ static void m04800m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 pw_salt_len = pw_len + salt_len; const u32 pw_salt_len = pw_len + salt_len;
u32 s0[4]; u32 s0[4];
u32 s1[4];
u32 s2[4];
u32 s3[4];
s0[0] = salt_buf[0]; s0[0] = salt_buf[0];
s0[1] = salt_buf[1]; s0[1] = salt_buf[1];
s0[2] = salt_buf[2]; s0[2] = salt_buf[2];
s0[3] = salt_buf[3]; s0[3] = salt_buf[3];
u32 s1[4];
s1[0] = 0x80; s1[0] = 0x80;
s1[1] = 0; s1[1] = 0;
s1[2] = 0; s1[2] = 0;
s1[3] = 0; s1[3] = 0;
u32 s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
// move w by 1 switch_buffer_by_offset_le_S (s0, s1, s2, s3, pw_len);
u32x w0_t[4]; w0[0] |= s0[0];
w0[1] |= s0[1];
w0[2] |= s0[2];
w0[3] |= s0[3];
w1[0] |= s1[0];
w1[1] |= s1[1];
w1[2] |= s1[2];
w1[3] |= s1[3];
w2[0] |= s2[0];
w2[1] |= s2[1];
w2[2] |= s2[2];
w2[3] |= s2[3];
w3[0] |= s3[0];
w3[1] |= s3[1];
w3[2] |= s3[2];
w3[3] |= s3[3];
w0_t[0] = w0[0]; switch_buffer_by_offset_le_S (w0, w1, w2, w3, 1);
w0_t[1] = w0[1];
w0_t[2] = w0[2];
w0_t[3] = w0[3];
u32x w1_t[4]; w0[0] |= salt_buf[4];
w1_t[0] = w1[0]; const u32 w0l = w0[0];
w1_t[1] = w1[1]; const u32 w1l = w0[1];
w1_t[2] = w1[2];
w1_t[3] = w1[3];
u32x w2_t[4]; w3[2] = pw_salt_len * 8;
w3[3] = 0;
w2_t[0] = 0;
w2_t[1] = 0;
w2_t[2] = 0;
w2_t[3] = 0;
u32x w3_t[4];
w3_t[0] = 0;
w3_t[1] = 0;
w3_t[2] = 0;
w3_t[3] = 0;
switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, 1);
switch_buffer_by_offset_le_S (s0, s1, s2, s3, 1 + pw_len);
w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
w0_t[2] |= s0[2];
w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
w2_t[1] |= s2[1];
w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
w3_t[2] = pw_salt_len * 8;
w3_t[3] = 0;
/**
* add id byte
*/
w0_t[0] |= salt_buf[4];
/** /**
* loop * loop
*/ */
u32x w0l = w0_t[0];
u32x w1l = w0_t[1];
for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
{ {
const u32x w0r = ix_create_bft (bfs_buf, il_pos); const u32x w0r = ix_create_bft (bfs_buf, il_pos);
w0_t[0] = w0l | (w0r << 8); const u32x w0lr = w0l | w0r;
w0_t[1] = w1l | (w0r >> 24);
u32x w0_t = w0l | (w0r << 8);
u32x w1_t = w1l | (w0r >> 24);
u32x w2_t = w0[2];
u32x w3_t = w0[3];
u32x w4_t = w1[0];
u32x w5_t = w1[1];
u32x w6_t = w1[2];
u32x w7_t = w1[3];
u32x w8_t = w2[0];
u32x w9_t = w2[1];
u32x wa_t = w2[2];
u32x wb_t = w2[3];
u32x wc_t = w3[0];
u32x wd_t = w3[1];
u32x we_t = w3[2];
u32x wf_t = w3[3];
/** /**
* md5 * md5
@ -156,73 +132,73 @@ static void m04800m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
u32x c = MD5M_C; u32x c = MD5M_C;
u32x d = MD5M_D; u32x d = MD5M_D;
MD5_STEP (MD5_Fo, a, b, c, d, w0_t[0], MD5C00, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w0_t[1], MD5C01, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w0_t[2], MD5C02, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, w2_t, MD5C02, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w0_t[3], MD5C03, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, w3_t, MD5C03, MD5S03);
MD5_STEP (MD5_Fo, a, b, c, d, w1_t[0], MD5C04, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w4_t, MD5C04, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w1_t[1], MD5C05, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w5_t, MD5C05, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w1_t[2], MD5C06, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, w6_t, MD5C06, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w1_t[3], MD5C07, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, w7_t, MD5C07, MD5S03);
MD5_STEP (MD5_Fo, a, b, c, d, w2_t[0], MD5C08, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w8_t, MD5C08, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w2_t[1], MD5C09, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w9_t, MD5C09, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w2_t[2], MD5C0a, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, wa_t, MD5C0a, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w2_t[3], MD5C0b, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, wb_t, MD5C0b, MD5S03);
MD5_STEP (MD5_Fo, a, b, c, d, w3_t[0], MD5C0c, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, wc_t, MD5C0c, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w3_t[1], MD5C0d, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, wd_t, MD5C0d, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w3_t[2], MD5C0e, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, we_t, MD5C0e, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w3_t[3], MD5C0f, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, wf_t, MD5C0f, MD5S03);
MD5_STEP (MD5_Go, a, b, c, d, w0_t[1], MD5C10, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, w1_t, MD5C10, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w1_t[2], MD5C11, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, w6_t, MD5C11, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w2_t[3], MD5C12, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, wb_t, MD5C12, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w0_t[0], MD5C13, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, w0_t, MD5C13, MD5S13);
MD5_STEP (MD5_Go, a, b, c, d, w1_t[1], MD5C14, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, w5_t, MD5C14, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w2_t[2], MD5C15, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, wa_t, MD5C15, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w3_t[3], MD5C16, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, wf_t, MD5C16, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w1_t[0], MD5C17, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, w4_t, MD5C17, MD5S13);
MD5_STEP (MD5_Go, a, b, c, d, w2_t[1], MD5C18, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, w9_t, MD5C18, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w3_t[2], MD5C19, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, we_t, MD5C19, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w0_t[3], MD5C1a, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, w3_t, MD5C1a, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w2_t[0], MD5C1b, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, w8_t, MD5C1b, MD5S13);
MD5_STEP (MD5_Go, a, b, c, d, w3_t[1], MD5C1c, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, wd_t, MD5C1c, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w0_t[2], MD5C1d, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, w2_t, MD5C1d, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w1_t[3], MD5C1e, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, w7_t, MD5C1e, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w3_t[0], MD5C1f, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, wc_t, MD5C1f, MD5S13);
MD5_STEP (MD5_H , a, b, c, d, w1_t[1], MD5C20, MD5S20); MD5_STEP (MD5_H , a, b, c, d, w5_t, MD5C20, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w2_t[0], MD5C21, MD5S21); MD5_STEP (MD5_H , d, a, b, c, w8_t, MD5C21, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w2_t[3], MD5C22, MD5S22); MD5_STEP (MD5_H , c, d, a, b, wb_t, MD5C22, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w3_t[2], MD5C23, MD5S23); MD5_STEP (MD5_H , b, c, d, a, we_t, MD5C23, MD5S23);
MD5_STEP (MD5_H , a, b, c, d, w0_t[1], MD5C24, MD5S20); MD5_STEP (MD5_H , a, b, c, d, w1_t, MD5C24, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w1_t[0], MD5C25, MD5S21); MD5_STEP (MD5_H , d, a, b, c, w4_t, MD5C25, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w1_t[3], MD5C26, MD5S22); MD5_STEP (MD5_H , c, d, a, b, w7_t, MD5C26, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w2_t[2], MD5C27, MD5S23); MD5_STEP (MD5_H , b, c, d, a, wa_t, MD5C27, MD5S23);
MD5_STEP (MD5_H , a, b, c, d, w3_t[1], MD5C28, MD5S20); MD5_STEP (MD5_H , a, b, c, d, wd_t, MD5C28, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w0_t[0], MD5C29, MD5S21); MD5_STEP (MD5_H , d, a, b, c, w0_t, MD5C29, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w0_t[3], MD5C2a, MD5S22); MD5_STEP (MD5_H , c, d, a, b, w3_t, MD5C2a, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w1_t[2], MD5C2b, MD5S23); MD5_STEP (MD5_H , b, c, d, a, w6_t, MD5C2b, MD5S23);
MD5_STEP (MD5_H , a, b, c, d, w2_t[1], MD5C2c, MD5S20); MD5_STEP (MD5_H , a, b, c, d, w9_t, MD5C2c, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w3_t[0], MD5C2d, MD5S21); MD5_STEP (MD5_H , d, a, b, c, wc_t, MD5C2d, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w3_t[3], MD5C2e, MD5S22); MD5_STEP (MD5_H , c, d, a, b, wf_t, MD5C2e, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w0_t[2], MD5C2f, MD5S23); MD5_STEP (MD5_H , b, c, d, a, w2_t, MD5C2f, MD5S23);
MD5_STEP (MD5_I , a, b, c, d, w0_t[0], MD5C30, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w0_t, MD5C30, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w1_t[3], MD5C31, MD5S31); MD5_STEP (MD5_I , d, a, b, c, w7_t, MD5C31, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w3_t[2], MD5C32, MD5S32); MD5_STEP (MD5_I , c, d, a, b, we_t, MD5C32, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w1_t[1], MD5C33, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w5_t, MD5C33, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w3_t[0], MD5C34, MD5S30); MD5_STEP (MD5_I , a, b, c, d, wc_t, MD5C34, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w0_t[3], MD5C35, MD5S31); MD5_STEP (MD5_I , d, a, b, c, w3_t, MD5C35, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w2_t[2], MD5C36, MD5S32); MD5_STEP (MD5_I , c, d, a, b, wa_t, MD5C36, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w0_t[1], MD5C37, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w1_t, MD5C37, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w2_t[0], MD5C38, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w8_t, MD5C38, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w3_t[3], MD5C39, MD5S31); MD5_STEP (MD5_I , d, a, b, c, wf_t, MD5C39, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w1_t[2], MD5C3a, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w3_t[1], MD5C3b, MD5S33); MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w1_t[0], MD5C3c, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w2_t[3], MD5C3d, MD5S31); MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w0_t[2], MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w2_t[1], MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
COMPARE_M_SIMD (a, d, c, b); COMPARE_M_SIMD (a, d, c, b);
} }
@ -254,92 +230,55 @@ static void m04800s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
const u32 pw_salt_len = pw_len + salt_len; const u32 pw_salt_len = pw_len + salt_len;
u32 s0[4]; u32 s0[4];
u32 s1[4];
u32 s2[4];
u32 s3[4];
s0[0] = salt_buf[0]; s0[0] = salt_buf[0];
s0[1] = salt_buf[1]; s0[1] = salt_buf[1];
s0[2] = salt_buf[2]; s0[2] = salt_buf[2];
s0[3] = salt_buf[3]; s0[3] = salt_buf[3];
u32 s1[4];
s1[0] = 0x80; s1[0] = 0x80;
s1[1] = 0; s1[1] = 0;
s1[2] = 0; s1[2] = 0;
s1[3] = 0; s1[3] = 0;
u32 s2[4];
s2[0] = 0; s2[0] = 0;
s2[1] = 0; s2[1] = 0;
s2[2] = 0; s2[2] = 0;
s2[3] = 0; s2[3] = 0;
u32 s3[4];
s3[0] = 0; s3[0] = 0;
s3[1] = 0; s3[1] = 0;
s3[2] = 0; s3[2] = 0;
s3[3] = 0; s3[3] = 0;
// move w by 1 switch_buffer_by_offset_le_S (s0, s1, s2, s3, pw_len);
u32x w0_t[4]; w0[0] |= s0[0];
w0[1] |= s0[1];
w0[2] |= s0[2];
w0[3] |= s0[3];
w1[0] |= s1[0];
w1[1] |= s1[1];
w1[2] |= s1[2];
w1[3] |= s1[3];
w2[0] |= s2[0];
w2[1] |= s2[1];
w2[2] |= s2[2];
w2[3] |= s2[3];
w3[0] |= s3[0];
w3[1] |= s3[1];
w3[2] |= s3[2];
w3[3] |= s3[3];
w0_t[0] = w0[0]; switch_buffer_by_offset_le_S (w0, w1, w2, w3, 1);
w0_t[1] = w0[1];
w0_t[2] = w0[2];
w0_t[3] = w0[3];
u32x w1_t[4]; w0[0] |= salt_buf[4];
w1_t[0] = w1[0]; const u32 w0l = w0[0];
w1_t[1] = w1[1]; const u32 w1l = w0[1];
w1_t[2] = w1[2];
w1_t[3] = w1[3];
u32x w2_t[4]; w3[2] = pw_salt_len * 8;
w3[3] = 0;
w2_t[0] = 0;
w2_t[1] = 0;
w2_t[2] = 0;
w2_t[3] = 0;
u32x w3_t[4];
w3_t[0] = 0;
w3_t[1] = 0;
w3_t[2] = 0;
w3_t[3] = 0;
switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, 1);
switch_buffer_by_offset_le_S (s0, s1, s2, s3, 1 + pw_len);
w0_t[0] |= s0[0];
w0_t[1] |= s0[1];
w0_t[2] |= s0[2];
w0_t[3] |= s0[3];
w1_t[0] |= s1[0];
w1_t[1] |= s1[1];
w1_t[2] |= s1[2];
w1_t[3] |= s1[3];
w2_t[0] |= s2[0];
w2_t[1] |= s2[1];
w2_t[2] |= s2[2];
w2_t[3] |= s2[3];
w3_t[0] |= s3[0];
w3_t[1] |= s3[1];
w3_t[2] = pw_salt_len * 8;
w3_t[3] = 0;
/**
* add id byte
*/
w0_t[0] |= salt_buf[4];
/** /**
* digest * digest
@ -357,15 +296,28 @@ static void m04800s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
* loop * loop
*/ */
u32x w0l = w0_t[0];
u32x w1l = w0_t[1];
for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
{ {
const u32x w0r = ix_create_bft (bfs_buf, il_pos); const u32x w0r = ix_create_bft (bfs_buf, il_pos);
w0_t[0] = w0l | (w0r << 8); const u32x w0lr = w0l | w0r;
w0_t[1] = w1l | (w0r >> 24);
u32x w0_t = w0l | (w0r << 8);
u32x w1_t = w1l | (w0r >> 24);
u32x w2_t = w0[2];
u32x w3_t = w0[3];
u32x w4_t = w1[0];
u32x w5_t = w1[1];
u32x w6_t = w1[2];
u32x w7_t = w1[3];
u32x w8_t = w2[0];
u32x w9_t = w2[1];
u32x wa_t = w2[2];
u32x wb_t = w2[3];
u32x wc_t = w3[0];
u32x wd_t = w3[1];
u32x we_t = w3[2];
u32x wf_t = w3[3];
/** /**
* md5 * md5
@ -376,76 +328,76 @@ static void m04800s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
u32x c = MD5M_C; u32x c = MD5M_C;
u32x d = MD5M_D; u32x d = MD5M_D;
MD5_STEP (MD5_Fo, a, b, c, d, w0_t[0], MD5C00, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w0_t[1], MD5C01, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w0_t[2], MD5C02, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, w2_t, MD5C02, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w0_t[3], MD5C03, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, w3_t, MD5C03, MD5S03);
MD5_STEP (MD5_Fo, a, b, c, d, w1_t[0], MD5C04, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w4_t, MD5C04, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w1_t[1], MD5C05, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w5_t, MD5C05, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w1_t[2], MD5C06, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, w6_t, MD5C06, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w1_t[3], MD5C07, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, w7_t, MD5C07, MD5S03);
MD5_STEP (MD5_Fo, a, b, c, d, w2_t[0], MD5C08, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, w8_t, MD5C08, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w2_t[1], MD5C09, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, w9_t, MD5C09, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w2_t[2], MD5C0a, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, wa_t, MD5C0a, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w2_t[3], MD5C0b, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, wb_t, MD5C0b, MD5S03);
MD5_STEP (MD5_Fo, a, b, c, d, w3_t[0], MD5C0c, MD5S00); MD5_STEP (MD5_Fo, a, b, c, d, wc_t, MD5C0c, MD5S00);
MD5_STEP (MD5_Fo, d, a, b, c, w3_t[1], MD5C0d, MD5S01); MD5_STEP (MD5_Fo, d, a, b, c, wd_t, MD5C0d, MD5S01);
MD5_STEP (MD5_Fo, c, d, a, b, w3_t[2], MD5C0e, MD5S02); MD5_STEP (MD5_Fo, c, d, a, b, we_t, MD5C0e, MD5S02);
MD5_STEP (MD5_Fo, b, c, d, a, w3_t[3], MD5C0f, MD5S03); MD5_STEP (MD5_Fo, b, c, d, a, wf_t, MD5C0f, MD5S03);
MD5_STEP (MD5_Go, a, b, c, d, w0_t[1], MD5C10, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, w1_t, MD5C10, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w1_t[2], MD5C11, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, w6_t, MD5C11, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w2_t[3], MD5C12, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, wb_t, MD5C12, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w0_t[0], MD5C13, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, w0_t, MD5C13, MD5S13);
MD5_STEP (MD5_Go, a, b, c, d, w1_t[1], MD5C14, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, w5_t, MD5C14, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w2_t[2], MD5C15, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, wa_t, MD5C15, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w3_t[3], MD5C16, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, wf_t, MD5C16, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w1_t[0], MD5C17, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, w4_t, MD5C17, MD5S13);
MD5_STEP (MD5_Go, a, b, c, d, w2_t[1], MD5C18, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, w9_t, MD5C18, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w3_t[2], MD5C19, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, we_t, MD5C19, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w0_t[3], MD5C1a, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, w3_t, MD5C1a, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w2_t[0], MD5C1b, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, w8_t, MD5C1b, MD5S13);
MD5_STEP (MD5_Go, a, b, c, d, w3_t[1], MD5C1c, MD5S10); MD5_STEP (MD5_Go, a, b, c, d, wd_t, MD5C1c, MD5S10);
MD5_STEP (MD5_Go, d, a, b, c, w0_t[2], MD5C1d, MD5S11); MD5_STEP (MD5_Go, d, a, b, c, w2_t, MD5C1d, MD5S11);
MD5_STEP (MD5_Go, c, d, a, b, w1_t[3], MD5C1e, MD5S12); MD5_STEP (MD5_Go, c, d, a, b, w7_t, MD5C1e, MD5S12);
MD5_STEP (MD5_Go, b, c, d, a, w3_t[0], MD5C1f, MD5S13); MD5_STEP (MD5_Go, b, c, d, a, wc_t, MD5C1f, MD5S13);
MD5_STEP (MD5_H , a, b, c, d, w1_t[1], MD5C20, MD5S20); MD5_STEP (MD5_H , a, b, c, d, w5_t, MD5C20, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w2_t[0], MD5C21, MD5S21); MD5_STEP (MD5_H , d, a, b, c, w8_t, MD5C21, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w2_t[3], MD5C22, MD5S22); MD5_STEP (MD5_H , c, d, a, b, wb_t, MD5C22, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w3_t[2], MD5C23, MD5S23); MD5_STEP (MD5_H , b, c, d, a, we_t, MD5C23, MD5S23);
MD5_STEP (MD5_H , a, b, c, d, w0_t[1], MD5C24, MD5S20); MD5_STEP (MD5_H , a, b, c, d, w1_t, MD5C24, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w1_t[0], MD5C25, MD5S21); MD5_STEP (MD5_H , d, a, b, c, w4_t, MD5C25, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w1_t[3], MD5C26, MD5S22); MD5_STEP (MD5_H , c, d, a, b, w7_t, MD5C26, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w2_t[2], MD5C27, MD5S23); MD5_STEP (MD5_H , b, c, d, a, wa_t, MD5C27, MD5S23);
MD5_STEP (MD5_H , a, b, c, d, w3_t[1], MD5C28, MD5S20); MD5_STEP (MD5_H , a, b, c, d, wd_t, MD5C28, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w0_t[0], MD5C29, MD5S21); MD5_STEP (MD5_H , d, a, b, c, w0_t, MD5C29, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w0_t[3], MD5C2a, MD5S22); MD5_STEP (MD5_H , c, d, a, b, w3_t, MD5C2a, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w1_t[2], MD5C2b, MD5S23); MD5_STEP (MD5_H , b, c, d, a, w6_t, MD5C2b, MD5S23);
MD5_STEP (MD5_H , a, b, c, d, w2_t[1], MD5C2c, MD5S20); MD5_STEP (MD5_H , a, b, c, d, w9_t, MD5C2c, MD5S20);
MD5_STEP (MD5_H , d, a, b, c, w3_t[0], MD5C2d, MD5S21); MD5_STEP (MD5_H , d, a, b, c, wc_t, MD5C2d, MD5S21);
MD5_STEP (MD5_H , c, d, a, b, w3_t[3], MD5C2e, MD5S22); MD5_STEP (MD5_H , c, d, a, b, wf_t, MD5C2e, MD5S22);
MD5_STEP (MD5_H , b, c, d, a, w0_t[2], MD5C2f, MD5S23); MD5_STEP (MD5_H , b, c, d, a, w2_t, MD5C2f, MD5S23);
MD5_STEP (MD5_I , a, b, c, d, w0_t[0], MD5C30, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w0_t, MD5C30, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w1_t[3], MD5C31, MD5S31); MD5_STEP (MD5_I , d, a, b, c, w7_t, MD5C31, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w3_t[2], MD5C32, MD5S32); MD5_STEP (MD5_I , c, d, a, b, we_t, MD5C32, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w1_t[1], MD5C33, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w5_t, MD5C33, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w3_t[0], MD5C34, MD5S30); MD5_STEP (MD5_I , a, b, c, d, wc_t, MD5C34, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w0_t[3], MD5C35, MD5S31); MD5_STEP (MD5_I , d, a, b, c, w3_t, MD5C35, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w2_t[2], MD5C36, MD5S32); MD5_STEP (MD5_I , c, d, a, b, wa_t, MD5C36, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w0_t[1], MD5C37, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w1_t, MD5C37, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w2_t[0], MD5C38, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w8_t, MD5C38, MD5S30);
MD5_STEP (MD5_I , d, a, b, c, w3_t[3], MD5C39, MD5S31); MD5_STEP (MD5_I , d, a, b, c, wf_t, MD5C39, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w1_t[2], MD5C3a, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w3_t[1], MD5C3b, MD5S33); MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
MD5_STEP (MD5_I , a, b, c, d, w1_t[0], MD5C3c, MD5S30); MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
if (MATCHES_NONE_VS (a, search[0])) continue; if (MATCHES_NONE_VS (a, search[0])) continue;
MD5_STEP (MD5_I , d, a, b, c, w2_t[3], MD5C3d, MD5S31); MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
MD5_STEP (MD5_I , c, d, a, b, w0_t[2], MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w2_t[1], MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
COMPARE_S_SIMD (a, d, c, b); COMPARE_S_SIMD (a, d, c, b);
} }