mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-22 22:58:30 +00:00
Converted to new SIMD: -m 190 -a 0
This commit is contained in:
Jens Steube
parent
811090ff23
commit
7c8532fe93
@ -5,6 +5,8 @@
|
||||
|
||||
#define _SHA1_
|
||||
|
||||
#define NEW_SIMD_CODE
|
||||
|
||||
#include "include/constants.h"
|
||||
#include "include/kernel_vendor.h"
|
||||
|
||||
@ -18,9 +20,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"
|
||||
|
||||
__kernel void m00190_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 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
|
||||
{
|
||||
@ -58,37 +58,14 @@ __kernel void m00190_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* loop
|
||||
*/
|
||||
|
||||
for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++)
|
||||
for (u32 il_pos = 0; il_pos < rules_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 u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
|
||||
|
||||
append_0x80_2x4 (w0, w1, out_len);
|
||||
|
||||
@ -96,28 +73,28 @@ __kernel void m00190_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* sha1
|
||||
*/
|
||||
|
||||
u32 w0_t = swap32 (w0[0]);
|
||||
u32 w1_t = swap32 (w0[1]);
|
||||
u32 w2_t = swap32 (w0[2]);
|
||||
u32 w3_t = swap32 (w0[3]);
|
||||
u32 w4_t = swap32 (w1[0]);
|
||||
u32 w5_t = swap32 (w1[1]);
|
||||
u32 w6_t = swap32 (w1[2]);
|
||||
u32 w7_t = swap32 (w1[3]);
|
||||
u32 w8_t = swap32 (w2[0]);
|
||||
u32 w9_t = swap32 (w2[1]);
|
||||
u32 wa_t = swap32 (w2[2]);
|
||||
u32 wb_t = swap32 (w2[3]);
|
||||
u32 wc_t = swap32 (w3[0]);
|
||||
u32 wd_t = swap32 (w3[1]);
|
||||
u32 we_t = 0;
|
||||
u32 wf_t = out_len * 8;
|
||||
u32x w0_t = swap32 (w0[0]);
|
||||
u32x w1_t = swap32 (w0[1]);
|
||||
u32x w2_t = swap32 (w0[2]);
|
||||
u32x w3_t = swap32 (w0[3]);
|
||||
u32x w4_t = swap32 (w1[0]);
|
||||
u32x w5_t = swap32 (w1[1]);
|
||||
u32x w6_t = swap32 (w1[2]);
|
||||
u32x w7_t = swap32 (w1[3]);
|
||||
u32x w8_t = swap32 (w2[0]);
|
||||
u32x w9_t = swap32 (w2[1]);
|
||||
u32x wa_t = swap32 (w2[2]);
|
||||
u32x wb_t = swap32 (w2[3]);
|
||||
u32x wc_t = swap32 (w3[0]);
|
||||
u32x wd_t = swap32 (w3[1]);
|
||||
u32x we_t = 0;
|
||||
u32x wf_t = out_len * 8;
|
||||
|
||||
u32 a = SHA1M_A;
|
||||
u32 b = SHA1M_B;
|
||||
u32 c = SHA1M_C;
|
||||
u32 d = SHA1M_D;
|
||||
u32 e = SHA1M_E;
|
||||
u32x a = SHA1M_A;
|
||||
u32x b = SHA1M_B;
|
||||
u32x c = SHA1M_C;
|
||||
u32x d = SHA1M_D;
|
||||
u32x e = SHA1M_E;
|
||||
|
||||
#undef K
|
||||
#define K SHA1C00
|
||||
@ -220,25 +197,11 @@ __kernel void m00190_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
d += SHA1M_D;
|
||||
c += SHA1M_C;
|
||||
|
||||
{
|
||||
const u32 r0 = a;
|
||||
const u32 r1 = e;
|
||||
const u32 r2 = d;
|
||||
const u32 r3 = c;
|
||||
|
||||
#include COMPARE_M
|
||||
}
|
||||
COMPARE_M_SIMD (a, e, d, c);
|
||||
|
||||
a &= 0x00000fff;
|
||||
|
||||
{
|
||||
const u32 r0 = a;
|
||||
const u32 r1 = e;
|
||||
const u32 r2 = d;
|
||||
const u32 r3 = c;
|
||||
|
||||
#include COMPARE_M
|
||||
}
|
||||
COMPARE_M_SIMD (a, e, d, c);
|
||||
}
|
||||
}
|
||||
|
||||
@ -298,37 +261,14 @@ __kernel void m00190_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* loop
|
||||
*/
|
||||
|
||||
for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++)
|
||||
for (u32 il_pos = 0; il_pos < rules_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 u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
|
||||
|
||||
append_0x80_2x4 (w0, w1, out_len);
|
||||
|
||||
@ -336,28 +276,28 @@ __kernel void m00190_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
* sha1
|
||||
*/
|
||||
|
||||
u32 w0_t = swap32 (w0[0]);
|
||||
u32 w1_t = swap32 (w0[1]);
|
||||
u32 w2_t = swap32 (w0[2]);
|
||||
u32 w3_t = swap32 (w0[3]);
|
||||
u32 w4_t = swap32 (w1[0]);
|
||||
u32 w5_t = swap32 (w1[1]);
|
||||
u32 w6_t = swap32 (w1[2]);
|
||||
u32 w7_t = swap32 (w1[3]);
|
||||
u32 w8_t = swap32 (w2[0]);
|
||||
u32 w9_t = swap32 (w2[1]);
|
||||
u32 wa_t = swap32 (w2[2]);
|
||||
u32 wb_t = swap32 (w2[3]);
|
||||
u32 wc_t = swap32 (w3[0]);
|
||||
u32 wd_t = swap32 (w3[1]);
|
||||
u32 we_t = 0;
|
||||
u32 wf_t = out_len * 8;
|
||||
u32x w0_t = swap32 (w0[0]);
|
||||
u32x w1_t = swap32 (w0[1]);
|
||||
u32x w2_t = swap32 (w0[2]);
|
||||
u32x w3_t = swap32 (w0[3]);
|
||||
u32x w4_t = swap32 (w1[0]);
|
||||
u32x w5_t = swap32 (w1[1]);
|
||||
u32x w6_t = swap32 (w1[2]);
|
||||
u32x w7_t = swap32 (w1[3]);
|
||||
u32x w8_t = swap32 (w2[0]);
|
||||
u32x w9_t = swap32 (w2[1]);
|
||||
u32x wa_t = swap32 (w2[2]);
|
||||
u32x wb_t = swap32 (w2[3]);
|
||||
u32x wc_t = swap32 (w3[0]);
|
||||
u32x wd_t = swap32 (w3[1]);
|
||||
u32x we_t = 0;
|
||||
u32x wf_t = out_len * 8;
|
||||
|
||||
u32 a = SHA1M_A;
|
||||
u32 b = SHA1M_B;
|
||||
u32 c = SHA1M_C;
|
||||
u32 d = SHA1M_D;
|
||||
u32 e = SHA1M_E;
|
||||
u32x a = SHA1M_A;
|
||||
u32x b = SHA1M_B;
|
||||
u32x c = SHA1M_C;
|
||||
u32x d = SHA1M_D;
|
||||
u32x e = SHA1M_E;
|
||||
|
||||
#undef K
|
||||
#define K SHA1C00
|
||||
@ -460,25 +400,11 @@ __kernel void m00190_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
||||
d += SHA1M_D;
|
||||
c += SHA1M_C;
|
||||
|
||||
{
|
||||
const u32 r0 = a;
|
||||
const u32 r1 = e;
|
||||
const u32 r2 = d;
|
||||
const u32 r3 = c;
|
||||
|
||||
#include COMPARE_S
|
||||
}
|
||||
COMPARE_S_SIMD (a, e, d, c);
|
||||
|
||||
a &= 0x00000fff;
|
||||
|
||||
{
|
||||
const u32 r0 = a;
|
||||
const u32 r1 = e;
|
||||
const u32 r2 = d;
|
||||
const u32 r3 = c;
|
||||
|
||||
#include COMPARE_S
|
||||
}
|
||||
COMPARE_S_SIMD (a, e, d, c);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user