X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm01000_a0.cl;h=2fb9f05e05f37035d45a826f99968a321ae63bbc;hb=161a6eb4bc643d8e636e96eda613f5137d30da59;hp=9309aa98e02d0ffffed679bbfb2be7dbc8fbe72f;hpb=50f39b3563fa429dbec441288bd9a21fc328c21e;p=hashcat.git diff --git a/OpenCL/m01000_a0.cl b/OpenCL/m01000_a0.cl index 9309aa9..2fb9f05 100644 --- a/OpenCL/m01000_a0.cl +++ b/OpenCL/m01000_a0.cl @@ -5,24 +5,18 @@ #define _MD4_ -#include "include/constants.h" -#include "include/kernel_vendor.h" - -#define DGST_R0 0 -#define DGST_R1 3 -#define DGST_R2 2 -#define DGST_R3 1 - -#include "include/kernel_functions.c" -#include "types_ocl.c" -#include "common.c" -#include "include/rp_gpu.h" -#include "rp.c" - -#define COMPARE_S "check_single_comp4.c" -#define COMPARE_M "check_multi_comp4.c" - -__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m04 (__global pw_t *pws, __global gpu_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) +#define NEW_SIMD_CODE + +#include "inc_vendor.cl" +#include "inc_hash_constants.h" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" + +__kernel void m01000_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_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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) { /** * modifier @@ -39,18 +33,16 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m04 (__glo if (gid >= gid_max) return; 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]; - 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]; + 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]; + 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; @@ -58,126 +50,92 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m04 (__glo * loop */ - for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) { - u32 w0[4]; - - w0[0] = pw_buf0[0]; - w0[1] = pw_buf0[1]; - w0[2] = pw_buf0[2]; - w0[3] = pw_buf0[3]; + u32x w0[4] = { 0 }; + u32x w1[4] = { 0 }; + u32x w2[4] = { 0 }; + u32x w3[4] = { 0 }; - u32 w1[4]; + const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); - w1[0] = pw_buf1[0]; - w1[1] = pw_buf1[1]; - w1[2] = pw_buf1[2]; - w1[3] = pw_buf1[3]; + append_0x80_2x4_VV (w0, w1, out_len); - u32 w2[4]; + make_unicode (w1, w2, w3); + make_unicode (w0, w0, w1); - 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[2] = out_len * 8 * 2; 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); - - u32 w0_t[4]; - u32 w1_t[4]; - u32 w2_t[4]; - u32 w3_t[4]; - - make_unicode (w0, w0_t, w1_t); - make_unicode (w1, w2_t, w3_t); - - w3_t[2] = out_len * 8 * 2; - - u32 tmp2; - - u32 a = MD4M_A; - u32 b = MD4M_B; - u32 c = MD4M_C; - u32 d = MD4M_D; - - MD4_STEP (MD4_Fo, a, b, c, d, w0_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w0_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w0_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w0_t[3], MD4C00, MD4S03); - MD4_STEP (MD4_Fo, a, b, c, d, w1_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w1_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w1_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w1_t[3], MD4C00, MD4S03); - MD4_STEP (MD4_Fo, a, b, c, d, w2_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w2_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w2_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w2_t[3], MD4C00, MD4S03); - MD4_STEP (MD4_Fo, a, b, c, d, w3_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w3_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w3_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w3_t[3], MD4C00, MD4S03); - - MD4_STEP (MD4_Go, a, b, c, d, w0_t[0], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[0], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[0], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[0], MD4C01, MD4S13); - MD4_STEP (MD4_Go, a, b, c, d, w0_t[1], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[1], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[1], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[1], MD4C01, MD4S13); - MD4_STEP (MD4_Go, a, b, c, d, w0_t[2], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[2], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[2], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[2], MD4C01, MD4S13); - MD4_STEP (MD4_Go, a, b, c, d, w0_t[3], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[3], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[3], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[3], MD4C01, MD4S13); - - MD4_STEP (MD4_H1, a, b, c, d, w0_t[0], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[0], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[0], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[0], MD4C02, MD4S23); - MD4_STEP (MD4_H1, a, b, c, d, w0_t[2], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[2], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[2], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[2], MD4C02, MD4S23); - MD4_STEP (MD4_H1, a, b, c, d, w0_t[1], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[1], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[1], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[1], MD4C02, MD4S23); - MD4_STEP (MD4_H1, a, b, c, d, w0_t[3], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[3], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[3], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[3], MD4C02, MD4S23); - - const u32 r0 = a; - const u32 r1 = d; - const u32 r2 = c; - const u32 r3 = b; - - #include COMPARE_M + u32x a = MD4M_A; + u32x b = MD4M_B; + u32x c = MD4M_C; + u32x d = MD4M_D; + + MD4_STEP (MD4_Fo, a, b, c, d, w0[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w0[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w0[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w0[3], MD4C00, MD4S03); + MD4_STEP (MD4_Fo, a, b, c, d, w1[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w1[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w1[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w1[3], MD4C00, MD4S03); + MD4_STEP (MD4_Fo, a, b, c, d, w2[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w2[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w2[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w2[3], MD4C00, MD4S03); + MD4_STEP (MD4_Fo, a, b, c, d, w3[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w3[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w3[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w3[3], MD4C00, MD4S03); + + MD4_STEP (MD4_Go, a, b, c, d, w0[0], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[0], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[0], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[0], MD4C01, MD4S13); + MD4_STEP (MD4_Go, a, b, c, d, w0[1], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[1], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[1], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[1], MD4C01, MD4S13); + MD4_STEP (MD4_Go, a, b, c, d, w0[2], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[2], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[2], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[2], MD4C01, MD4S13); + MD4_STEP (MD4_Go, a, b, c, d, w0[3], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[3], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[3], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[3], MD4C01, MD4S13); + + MD4_STEP (MD4_H , a, b, c, d, w0[0], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[0], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[0], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[0], MD4C02, MD4S23); + MD4_STEP (MD4_H , a, b, c, d, w0[2], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[2], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[2], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[2], MD4C02, MD4S23); + MD4_STEP (MD4_H , a, b, c, d, w0[1], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[1], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[1], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[1], MD4C02, MD4S23); + MD4_STEP (MD4_H , a, b, c, d, w0[3], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[3], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[3], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[3], MD4C02, MD4S23); + + COMPARE_M_SIMD (a, d, c, b); } } -__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m08 (__global pw_t *pws, __global gpu_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m01000_m08 (__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_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m16 (__global pw_t *pws, __global gpu_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m01000_m16 (__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_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 __attribute__((reqd_work_group_size (64, 1, 1))) m01000_s04 (__global pw_t *pws, __global gpu_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 m01000_s04 (__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_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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) { /** * modifier @@ -194,18 +152,16 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_s04 (__glo if (gid >= gid_max) return; 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]; - 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]; + 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]; + 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; @@ -225,121 +181,90 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_s04 (__glo * loop */ - for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE) { - u32 w0[4]; - - 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]; + u32x w0[4] = { 0 }; + u32x w1[4] = { 0 }; + u32x w2[4] = { 0 }; + u32x w3[4] = { 0 }; - u32 w2[4]; + const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); - w2[0] = 0; - w2[1] = 0; - w2[2] = 0; - w2[3] = 0; + append_0x80_2x4_VV (w0, w1, out_len); - u32 w3[4]; + make_unicode (w1, w2, w3); + make_unicode (w0, w0, w1); - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; + w3[2] = out_len * 8 * 2; 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); - - u32 w0_t[4]; - u32 w1_t[4]; - u32 w2_t[4]; - u32 w3_t[4]; - - make_unicode (w0, w0_t, w1_t); - make_unicode (w1, w2_t, w3_t); - - w3_t[2] = out_len * 8 * 2; - - u32 tmp2; - - u32 a = MD4M_A; - u32 b = MD4M_B; - u32 c = MD4M_C; - u32 d = MD4M_D; - - MD4_STEP (MD4_Fo, a, b, c, d, w0_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w0_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w0_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w0_t[3], MD4C00, MD4S03); - MD4_STEP (MD4_Fo, a, b, c, d, w1_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w1_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w1_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w1_t[3], MD4C00, MD4S03); - MD4_STEP (MD4_Fo, a, b, c, d, w2_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w2_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w2_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w2_t[3], MD4C00, MD4S03); - MD4_STEP (MD4_Fo, a, b, c, d, w3_t[0], MD4C00, MD4S00); - MD4_STEP (MD4_Fo, d, a, b, c, w3_t[1], MD4C00, MD4S01); - MD4_STEP (MD4_Fo, c, d, a, b, w3_t[2], MD4C00, MD4S02); - MD4_STEP (MD4_Fo, b, c, d, a, w3_t[3], MD4C00, MD4S03); - - MD4_STEP (MD4_Go, a, b, c, d, w0_t[0], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[0], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[0], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[0], MD4C01, MD4S13); - MD4_STEP (MD4_Go, a, b, c, d, w0_t[1], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[1], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[1], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[1], MD4C01, MD4S13); - MD4_STEP (MD4_Go, a, b, c, d, w0_t[2], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[2], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[2], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[2], MD4C01, MD4S13); - MD4_STEP (MD4_Go, a, b, c, d, w0_t[3], MD4C01, MD4S10); - MD4_STEP (MD4_Go, d, a, b, c, w1_t[3], MD4C01, MD4S11); - MD4_STEP (MD4_Go, c, d, a, b, w2_t[3], MD4C01, MD4S12); - MD4_STEP (MD4_Go, b, c, d, a, w3_t[3], MD4C01, MD4S13); - - MD4_STEP (MD4_H1, a, b, c, d, w0_t[0], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[0], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[0], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[0], MD4C02, MD4S23); - MD4_STEP (MD4_H1, a, b, c, d, w0_t[2], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[2], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[2], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[2], MD4C02, MD4S23); - MD4_STEP (MD4_H1, a, b, c, d, w0_t[1], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[1], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[1], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[1], MD4C02, MD4S23); - MD4_STEP (MD4_H1, a, b, c, d, w0_t[3], MD4C02, MD4S20); - MD4_STEP (MD4_H2, d, a, b, c, w2_t[3], MD4C02, MD4S21); - MD4_STEP (MD4_H1, c, d, a, b, w1_t[3], MD4C02, MD4S22); - MD4_STEP (MD4_H2, b, c, d, a, w3_t[3], MD4C02, MD4S23); - - const u32 r0 = a; - const u32 r1 = d; - const u32 r2 = c; - const u32 r3 = b; - - #include COMPARE_S + u32x a = MD4M_A; + u32x b = MD4M_B; + u32x c = MD4M_C; + u32x d = MD4M_D; + + MD4_STEP (MD4_Fo, a, b, c, d, w0[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w0[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w0[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w0[3], MD4C00, MD4S03); + MD4_STEP (MD4_Fo, a, b, c, d, w1[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w1[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w1[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w1[3], MD4C00, MD4S03); + MD4_STEP (MD4_Fo, a, b, c, d, w2[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w2[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w2[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w2[3], MD4C00, MD4S03); + MD4_STEP (MD4_Fo, a, b, c, d, w3[0], MD4C00, MD4S00); + MD4_STEP (MD4_Fo, d, a, b, c, w3[1], MD4C00, MD4S01); + MD4_STEP (MD4_Fo, c, d, a, b, w3[2], MD4C00, MD4S02); + MD4_STEP (MD4_Fo, b, c, d, a, w3[3], MD4C00, MD4S03); + + MD4_STEP (MD4_Go, a, b, c, d, w0[0], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[0], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[0], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[0], MD4C01, MD4S13); + MD4_STEP (MD4_Go, a, b, c, d, w0[1], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[1], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[1], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[1], MD4C01, MD4S13); + MD4_STEP (MD4_Go, a, b, c, d, w0[2], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[2], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[2], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[2], MD4C01, MD4S13); + MD4_STEP (MD4_Go, a, b, c, d, w0[3], MD4C01, MD4S10); + MD4_STEP (MD4_Go, d, a, b, c, w1[3], MD4C01, MD4S11); + MD4_STEP (MD4_Go, c, d, a, b, w2[3], MD4C01, MD4S12); + MD4_STEP (MD4_Go, b, c, d, a, w3[3], MD4C01, MD4S13); + + MD4_STEP (MD4_H , a, b, c, d, w0[0], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[0], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[0], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[0], MD4C02, MD4S23); + MD4_STEP (MD4_H , a, b, c, d, w0[2], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[2], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[2], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[2], MD4C02, MD4S23); + MD4_STEP (MD4_H , a, b, c, d, w0[1], MD4C02, MD4S20); + MD4_STEP (MD4_H , d, a, b, c, w2[1], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[1], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[1], MD4C02, MD4S23); + MD4_STEP (MD4_H , a, b, c, d, w0[3], MD4C02, MD4S20); + + if (MATCHES_NONE_VS (a, search[0])) continue; + + MD4_STEP (MD4_H , d, a, b, c, w2[3], MD4C02, MD4S21); + MD4_STEP (MD4_H , c, d, a, b, w1[3], MD4C02, MD4S22); + MD4_STEP (MD4_H , b, c, d, a, w3[3], MD4C02, MD4S23); + + COMPARE_S_SIMD (a, d, c, b); } } -__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_s08 (__global pw_t *pws, __global gpu_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m01000_s08 (__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_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 __attribute__((reqd_work_group_size (64, 1, 1))) m01000_s16 (__global pw_t *pws, __global gpu_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) +__kernel void m01000_s16 (__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_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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) { }