mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-23 07:08:19 +00:00
Converted to new SIMD: -m 1400 -a 0
This commit is contained in:
parent
df0cba1205
commit
b335e5610f
@ -5,6 +5,8 @@
|
|||||||
|
|
||||||
#define _SHA256_
|
#define _SHA256_
|
||||||
|
|
||||||
|
#define NEW_SIMD_CODE
|
||||||
|
|
||||||
#include "include/constants.h"
|
#include "include/constants.h"
|
||||||
#include "include/kernel_vendor.h"
|
#include "include/kernel_vendor.h"
|
||||||
|
|
||||||
@ -18,9 +20,7 @@
|
|||||||
#include "OpenCL/common.c"
|
#include "OpenCL/common.c"
|
||||||
#include "include/rp_kernel.h"
|
#include "include/rp_kernel.h"
|
||||||
#include "OpenCL/rp.c"
|
#include "OpenCL/rp.c"
|
||||||
|
#include "OpenCL/simd.c"
|
||||||
#define COMPARE_S "OpenCL/check_single_comp4.c"
|
|
||||||
#define COMPARE_M "OpenCL/check_multi_comp4.c"
|
|
||||||
|
|
||||||
__kernel void m01400_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)
|
__kernel void m01400_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 m01400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
|||||||
* loop
|
* 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];
|
const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
|
||||||
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);
|
|
||||||
|
|
||||||
append_0x80_2x4 (w0, w1, out_len);
|
append_0x80_2x4 (w0, w1, out_len);
|
||||||
|
|
||||||
@ -96,31 +73,31 @@ __kernel void m01400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
|||||||
* SHA256
|
* SHA256
|
||||||
*/
|
*/
|
||||||
|
|
||||||
u32 w0_t = swap32 (w0[0]);
|
u32x w0_t = swap32 (w0[0]);
|
||||||
u32 w1_t = swap32 (w0[1]);
|
u32x w1_t = swap32 (w0[1]);
|
||||||
u32 w2_t = swap32 (w0[2]);
|
u32x w2_t = swap32 (w0[2]);
|
||||||
u32 w3_t = swap32 (w0[3]);
|
u32x w3_t = swap32 (w0[3]);
|
||||||
u32 w4_t = swap32 (w1[0]);
|
u32x w4_t = swap32 (w1[0]);
|
||||||
u32 w5_t = swap32 (w1[1]);
|
u32x w5_t = swap32 (w1[1]);
|
||||||
u32 w6_t = swap32 (w1[2]);
|
u32x w6_t = swap32 (w1[2]);
|
||||||
u32 w7_t = swap32 (w1[3]);
|
u32x w7_t = swap32 (w1[3]);
|
||||||
u32 w8_t = 0;
|
u32x w8_t = 0;
|
||||||
u32 w9_t = 0;
|
u32x w9_t = 0;
|
||||||
u32 wa_t = 0;
|
u32x wa_t = 0;
|
||||||
u32 wb_t = 0;
|
u32x wb_t = 0;
|
||||||
u32 wc_t = 0;
|
u32x wc_t = 0;
|
||||||
u32 wd_t = 0;
|
u32x wd_t = 0;
|
||||||
u32 we_t = 0;
|
u32x we_t = 0;
|
||||||
u32 wf_t = out_len * 8;
|
u32x wf_t = out_len * 8;
|
||||||
|
|
||||||
u32 a = SHA256M_A;
|
u32x a = SHA256M_A;
|
||||||
u32 b = SHA256M_B;
|
u32x b = SHA256M_B;
|
||||||
u32 c = SHA256M_C;
|
u32x c = SHA256M_C;
|
||||||
u32 d = SHA256M_D;
|
u32x d = SHA256M_D;
|
||||||
u32 e = SHA256M_E;
|
u32x e = SHA256M_E;
|
||||||
u32 f = SHA256M_F;
|
u32x f = SHA256M_F;
|
||||||
u32 g = SHA256M_G;
|
u32x g = SHA256M_G;
|
||||||
u32 h = SHA256M_H;
|
u32x h = SHA256M_H;
|
||||||
|
|
||||||
SHA256_STEP (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, SHA256C00);
|
SHA256_STEP (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, SHA256C00);
|
||||||
SHA256_STEP (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, SHA256C01);
|
SHA256_STEP (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, SHA256C01);
|
||||||
@ -190,13 +167,7 @@ __kernel void m01400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
|||||||
we_t = SHA256_EXPAND (wc_t, w7_t, wf_t, we_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, c, d, e, f, g, h, a, b, we_t, SHA256C3e);
|
we_t = SHA256_EXPAND (wc_t, w7_t, wf_t, we_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, c, d, e, f, g, h, a, b, we_t, SHA256C3e);
|
||||||
wf_t = SHA256_EXPAND (wd_t, w8_t, w0_t, wf_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, SHA256C3f);
|
wf_t = SHA256_EXPAND (wd_t, w8_t, w0_t, wf_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, SHA256C3f);
|
||||||
|
|
||||||
|
COMPARE_M_SIMD (d, h, c, g);
|
||||||
const u32 r0 = d;
|
|
||||||
const u32 r1 = h;
|
|
||||||
const u32 r2 = c;
|
|
||||||
const u32 r3 = g;
|
|
||||||
|
|
||||||
#include COMPARE_M
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -256,37 +227,14 @@ __kernel void m01400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
|||||||
* loop
|
* 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];
|
const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
|
||||||
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);
|
|
||||||
|
|
||||||
append_0x80_2x4 (w0, w1, out_len);
|
append_0x80_2x4 (w0, w1, out_len);
|
||||||
|
|
||||||
@ -294,31 +242,31 @@ __kernel void m01400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
|||||||
* SHA256
|
* SHA256
|
||||||
*/
|
*/
|
||||||
|
|
||||||
u32 w0_t = swap32 (w0[0]);
|
u32x w0_t = swap32 (w0[0]);
|
||||||
u32 w1_t = swap32 (w0[1]);
|
u32x w1_t = swap32 (w0[1]);
|
||||||
u32 w2_t = swap32 (w0[2]);
|
u32x w2_t = swap32 (w0[2]);
|
||||||
u32 w3_t = swap32 (w0[3]);
|
u32x w3_t = swap32 (w0[3]);
|
||||||
u32 w4_t = swap32 (w1[0]);
|
u32x w4_t = swap32 (w1[0]);
|
||||||
u32 w5_t = swap32 (w1[1]);
|
u32x w5_t = swap32 (w1[1]);
|
||||||
u32 w6_t = swap32 (w1[2]);
|
u32x w6_t = swap32 (w1[2]);
|
||||||
u32 w7_t = swap32 (w1[3]);
|
u32x w7_t = swap32 (w1[3]);
|
||||||
u32 w8_t = 0;
|
u32x w8_t = 0;
|
||||||
u32 w9_t = 0;
|
u32x w9_t = 0;
|
||||||
u32 wa_t = 0;
|
u32x wa_t = 0;
|
||||||
u32 wb_t = 0;
|
u32x wb_t = 0;
|
||||||
u32 wc_t = 0;
|
u32x wc_t = 0;
|
||||||
u32 wd_t = 0;
|
u32x wd_t = 0;
|
||||||
u32 we_t = 0;
|
u32x we_t = 0;
|
||||||
u32 wf_t = out_len * 8;
|
u32x wf_t = out_len * 8;
|
||||||
|
|
||||||
u32 a = SHA256M_A;
|
u32x a = SHA256M_A;
|
||||||
u32 b = SHA256M_B;
|
u32x b = SHA256M_B;
|
||||||
u32 c = SHA256M_C;
|
u32x c = SHA256M_C;
|
||||||
u32 d = SHA256M_D;
|
u32x d = SHA256M_D;
|
||||||
u32 e = SHA256M_E;
|
u32x e = SHA256M_E;
|
||||||
u32 f = SHA256M_F;
|
u32x f = SHA256M_F;
|
||||||
u32 g = SHA256M_G;
|
u32x g = SHA256M_G;
|
||||||
u32 h = SHA256M_H;
|
u32x h = SHA256M_H;
|
||||||
|
|
||||||
SHA256_STEP (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, SHA256C00);
|
SHA256_STEP (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, SHA256C00);
|
||||||
SHA256_STEP (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, SHA256C01);
|
SHA256_STEP (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, SHA256C01);
|
||||||
@ -388,13 +336,7 @@ __kernel void m01400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
|
|||||||
we_t = SHA256_EXPAND (wc_t, w7_t, wf_t, we_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, c, d, e, f, g, h, a, b, we_t, SHA256C3e);
|
we_t = SHA256_EXPAND (wc_t, w7_t, wf_t, we_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, c, d, e, f, g, h, a, b, we_t, SHA256C3e);
|
||||||
wf_t = SHA256_EXPAND (wd_t, w8_t, w0_t, wf_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, SHA256C3f);
|
wf_t = SHA256_EXPAND (wd_t, w8_t, w0_t, wf_t); SHA256_STEP (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, SHA256C3f);
|
||||||
|
|
||||||
|
COMPARE_S_SIMD (d, h, c, g);
|
||||||
const u32 r0 = d;
|
|
||||||
const u32 r1 = h;
|
|
||||||
const u32 r2 = c;
|
|
||||||
const u32 r3 = g;
|
|
||||||
|
|
||||||
#include COMPARE_S
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user