diff --git a/OpenCL/inc_common.h b/OpenCL/inc_common.h index dd0f3560c..9e679d8fa 100644 --- a/OpenCL/inc_common.h +++ b/OpenCL/inc_common.h @@ -26,85 +26,63 @@ * - P19: Type of the esalt_bufs structure with additional data, or void. */ + #if defined IS_CUDA || defined IS_HIP -#define KERN_ATTR(p2,p4,p5,p6,p19) \ - MAYBE_UNUSED GLOBAL_AS pw_t *pws, \ - MAYBE_UNUSED p2 const kernel_rule_t *g_rules_buf, \ - MAYBE_UNUSED GLOBAL_AS const pw_t *combs_buf, \ - MAYBE_UNUSED p4, \ - MAYBE_UNUSED GLOBAL_AS p5 *tmps, \ - MAYBE_UNUSED GLOBAL_AS p6 *hooks, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_a, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_b, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_c, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_d, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_a, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_b, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_c, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_d, \ - MAYBE_UNUSED GLOBAL_AS plain_t *plains_buf, \ - MAYBE_UNUSED GLOBAL_AS const digest_t *digests_buf, \ - MAYBE_UNUSED GLOBAL_AS u32 *hashes_shown, \ - MAYBE_UNUSED GLOBAL_AS const salt_t *salt_bufs, \ - MAYBE_UNUSED GLOBAL_AS const p19 *esalt_bufs, \ - MAYBE_UNUSED GLOBAL_AS u32 *d_return_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra0_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra1_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra2_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra3_buf, \ - MAYBE_UNUSED const u32 bitmap_mask, \ - MAYBE_UNUSED const u32 bitmap_shift1, \ - MAYBE_UNUSED const u32 bitmap_shift2, \ - MAYBE_UNUSED const u32 salt_pos_host, \ - MAYBE_UNUSED const u32 loop_pos, \ - MAYBE_UNUSED const u32 loop_cnt, \ - MAYBE_UNUSED const u32 il_cnt, \ - MAYBE_UNUSED const u32 digests_cnt, \ - MAYBE_UNUSED const u32 digests_offset_host, \ - MAYBE_UNUSED const u32 combs_mode, \ - MAYBE_UNUSED const u32 salt_repeat, \ - MAYBE_UNUSED const u64 pws_pos, \ - MAYBE_UNUSED const u64 gid_max +#define KERN_ATTR(p2,p4,p5,p6,p19) \ + MAYBE_UNUSED GLOBAL_AS pw_t *pws, \ + MAYBE_UNUSED p2 const kernel_rule_t *g_rules_buf, \ + MAYBE_UNUSED GLOBAL_AS const pw_t *combs_buf, \ + MAYBE_UNUSED p4, \ + MAYBE_UNUSED GLOBAL_AS p5 *tmps, \ + MAYBE_UNUSED GLOBAL_AS p6 *hooks, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_a, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_b, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_c, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_d, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_a, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_b, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_c, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_d, \ + MAYBE_UNUSED GLOBAL_AS plain_t *plains_buf, \ + MAYBE_UNUSED GLOBAL_AS const digest_t *digests_buf, \ + MAYBE_UNUSED GLOBAL_AS u32 *hashes_shown, \ + MAYBE_UNUSED GLOBAL_AS const salt_t *salt_bufs, \ + MAYBE_UNUSED GLOBAL_AS const p19 *esalt_bufs, \ + MAYBE_UNUSED GLOBAL_AS u32 *d_return_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra0_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra1_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra2_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra3_buf, \ + MAYBE_UNUSED GLOBAL_AS const kernel_param_t *kernel_param #else -#define KERN_ATTR(p2,p4,p5,p6,p19) \ - MAYBE_UNUSED GLOBAL_AS pw_t *pws, \ - MAYBE_UNUSED p2 const kernel_rule_t *rules_buf, \ - MAYBE_UNUSED GLOBAL_AS const pw_t *combs_buf, \ - MAYBE_UNUSED p4, \ - MAYBE_UNUSED GLOBAL_AS p5 *tmps, \ - MAYBE_UNUSED GLOBAL_AS p6 *hooks, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_a, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_b, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_c, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_d, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_a, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_b, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_c, \ - MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_d, \ - MAYBE_UNUSED GLOBAL_AS plain_t *plains_buf, \ - MAYBE_UNUSED GLOBAL_AS const digest_t *digests_buf, \ - MAYBE_UNUSED GLOBAL_AS u32 *hashes_shown, \ - MAYBE_UNUSED GLOBAL_AS const salt_t *salt_bufs, \ - MAYBE_UNUSED GLOBAL_AS const p19 *esalt_bufs, \ - MAYBE_UNUSED GLOBAL_AS u32 *d_return_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra0_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra1_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra2_buf, \ - MAYBE_UNUSED GLOBAL_AS void *d_extra3_buf, \ - MAYBE_UNUSED const u32 bitmap_mask, \ - MAYBE_UNUSED const u32 bitmap_shift1, \ - MAYBE_UNUSED const u32 bitmap_shift2, \ - MAYBE_UNUSED const u32 salt_pos_host, \ - MAYBE_UNUSED const u32 loop_pos, \ - MAYBE_UNUSED const u32 loop_cnt, \ - MAYBE_UNUSED const u32 il_cnt, \ - MAYBE_UNUSED const u32 digests_cnt, \ - MAYBE_UNUSED const u32 digests_offset_host, \ - MAYBE_UNUSED const u32 combs_mode, \ - MAYBE_UNUSED const u32 salt_repeat, \ - MAYBE_UNUSED const u64 pws_pos, \ - MAYBE_UNUSED const u64 gid_max +#define KERN_ATTR(p2,p4,p5,p6,p19) \ + MAYBE_UNUSED GLOBAL_AS pw_t *pws, \ + MAYBE_UNUSED p2 const kernel_rule_t *rules_buf, \ + MAYBE_UNUSED GLOBAL_AS const pw_t *combs_buf, \ + MAYBE_UNUSED p4, \ + MAYBE_UNUSED GLOBAL_AS p5 *tmps, \ + MAYBE_UNUSED GLOBAL_AS p6 *hooks, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_a, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_b, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_c, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s1_d, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_a, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_b, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_c, \ + MAYBE_UNUSED GLOBAL_AS const u32 *bitmaps_buf_s2_d, \ + MAYBE_UNUSED GLOBAL_AS plain_t *plains_buf, \ + MAYBE_UNUSED GLOBAL_AS const digest_t *digests_buf, \ + MAYBE_UNUSED GLOBAL_AS u32 *hashes_shown, \ + MAYBE_UNUSED GLOBAL_AS const salt_t *salt_bufs, \ + MAYBE_UNUSED GLOBAL_AS const p19 *esalt_bufs, \ + MAYBE_UNUSED GLOBAL_AS u32 *d_return_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra0_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra1_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra2_buf, \ + MAYBE_UNUSED GLOBAL_AS void *d_extra3_buf, \ + MAYBE_UNUSED GLOBAL_AS const kernel_param_t *kernel_param #endif + /* * Shortcut macros for usage in the actual kernels * diff --git a/OpenCL/inc_comp_multi.cl b/OpenCL/inc_comp_multi.cl index c402f37a5..1e38c6d0c 100644 --- a/OpenCL/inc_comp_multi.cl +++ b/OpenCL/inc_comp_multi.cl @@ -14,19 +14,19 @@ if (check (digest_tp, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, - bitmap_mask, - bitmap_shift1, - bitmap_shift2)) + BITMAP_MASK, + BITMAP_SHIFT1, + BITMAP_SHIFT2)) { - int digest_pos = find_hash (digest_tp, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (digest_tp, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos != -1) { - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/inc_comp_multi_bs.cl b/OpenCL/inc_comp_multi_bs.cl index 8ba742b26..5852f2826 100644 --- a/OpenCL/inc_comp_multi_bs.cl +++ b/OpenCL/inc_comp_multi_bs.cl @@ -14,21 +14,21 @@ if (check (digest_tp, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, - bitmap_mask, - bitmap_shift1, - bitmap_shift2)) + BITMAP_MASK, + BITMAP_SHIFT1, + BITMAP_SHIFT2)) { - int digest_pos = find_hash (digest_tp, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (digest_tp, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos != -1) { - if ((il_pos + slice) < il_cnt) + if ((il_pos + slice) < IL_CNT) { - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + slice, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + slice, 0, 0); } } } diff --git a/OpenCL/inc_comp_single.cl b/OpenCL/inc_comp_single.cl index a5fb8dd2e..0b300000c 100644 --- a/OpenCL/inc_comp_single.cl +++ b/OpenCL/inc_comp_single.cl @@ -3,10 +3,10 @@ if ((r0 == search[0]) && (r2 == search[2]) && (r3 == search[3])) { - const u32 final_hash_pos = DIGESTS_OFFSET + 0; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos, 0, 0); } } diff --git a/OpenCL/inc_comp_single_bs.cl b/OpenCL/inc_comp_single_bs.cl index e841ce005..a22d83320 100644 --- a/OpenCL/inc_comp_single_bs.cl +++ b/OpenCL/inc_comp_single_bs.cl @@ -1,10 +1,10 @@ -if ((il_pos + slice) < il_cnt) +if ((il_pos + slice) < IL_CNT) { - const u32 final_hash_pos = DIGESTS_OFFSET + 0; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + slice, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + slice, 0, 0); } } diff --git a/OpenCL/inc_scalar.cl b/OpenCL/inc_scalar.cl index dc392f0ba..1900bf76c 100644 --- a/OpenCL/inc_scalar.cl +++ b/OpenCL/inc_scalar.cl @@ -7,11 +7,11 @@ { \ if (((h0) == search[0]) && ((h1) == search[1]) && ((h2) == search[2]) && ((h3) == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos, 0, 0); \ } \ } \ } @@ -23,19 +23,19 @@ if (check (digest_tp0, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp0, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); \ } \ } \ } \ diff --git a/OpenCL/inc_simd.h b/OpenCL/inc_simd.h index c3577b297..836f6e197 100644 --- a/OpenCL/inc_simd.h +++ b/OpenCL/inc_simd.h @@ -17,11 +17,11 @@ { \ if (((h0) == search[0]) && ((h1) == search[1]) && ((h2) == search[2]) && ((h3) == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos, 0, 0); \ } \ } \ } @@ -33,19 +33,19 @@ if (check (digest_tp0, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp0, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); \ } \ } \ } \ @@ -66,21 +66,21 @@ { \ if (((h0).s0 == search[0]) && ((h1).s0 == search[1]) && ((h2).s0 == search[2]) && ((h3).s0 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ \ if (((h0).s1 == search[0]) && ((h1).s1 == search[1]) && ((h2).s1 == search[2]) && ((h3).s1 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ } @@ -93,19 +93,19 @@ if (check (digest_tp0, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp0, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ } \ @@ -113,19 +113,19 @@ if (check (digest_tp1, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp1, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ } \ @@ -144,41 +144,41 @@ { \ if (((h0).s0 == search[0]) && ((h1).s0 == search[1]) && ((h2).s0 == search[2]) && ((h3).s0 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ \ if (((h0).s1 == search[0]) && ((h1).s1 == search[1]) && ((h2).s1 == search[2]) && ((h3).s1 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ \ if (((h0).s2 == search[0]) && ((h1).s2 == search[1]) && ((h2).s2 == search[2]) && ((h3).s2 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 2, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 2, 0, 0); \ } \ } \ \ if (((h0).s3 == search[0]) && ((h1).s3 == search[1]) && ((h2).s3 == search[2]) && ((h3).s3 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 3, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 3, 0, 0); \ } \ } \ } @@ -193,19 +193,19 @@ if (check (digest_tp0, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp0, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ } \ @@ -213,19 +213,19 @@ if (check (digest_tp1, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp1, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ } \ @@ -233,19 +233,19 @@ if (check (digest_tp2, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp2, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp2, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 2, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 2, 0, 0); \ } \ } \ } \ @@ -253,19 +253,19 @@ if (check (digest_tp3, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp3, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp3, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 3, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 3, 0, 0); \ } \ } \ } \ @@ -284,80 +284,80 @@ { \ if (((h0).s0 == search[0]) && ((h1).s0 == search[1]) && ((h2).s0 == search[2]) && ((h3).s0 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ \ if (((h0).s1 == search[0]) && ((h1).s1 == search[1]) && ((h2).s1 == search[2]) && ((h3).s1 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ \ if (((h0).s2 == search[0]) && ((h1).s2 == search[1]) && ((h2).s2 == search[2]) && ((h3).s2 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 2, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 2, 0, 0); \ } \ } \ \ if (((h0).s3 == search[0]) && ((h1).s3 == search[1]) && ((h2).s3 == search[2]) && ((h3).s3 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 3, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 3, 0, 0); \ } \ } \ if (((h0).s4 == search[0]) && ((h1).s4 == search[1]) && ((h2).s4 == search[2]) && ((h3).s4 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 4, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 4, 0, 0); \ } \ } \ \ if (((h0).s5 == search[0]) && ((h1).s5 == search[1]) && ((h2).s5 == search[2]) && ((h3).s5 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 5, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 5, 0, 0); \ } \ } \ \ if (((h0).s6 == search[0]) && ((h1).s6 == search[1]) && ((h2).s6 == search[2]) && ((h3).s6 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 6, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 6, 0, 0); \ } \ } \ \ if (((h0).s7 == search[0]) && ((h1).s7 == search[1]) && ((h2).s7 == search[2]) && ((h3).s7 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 7, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 7, 0, 0); \ } \ } \ } @@ -376,19 +376,19 @@ if (check (digest_tp0, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp0, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ } \ @@ -396,19 +396,19 @@ if (check (digest_tp1, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp1, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ } \ @@ -416,19 +416,19 @@ if (check (digest_tp2, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp2, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp2, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 2, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 2, 0, 0); \ } \ } \ } \ @@ -436,38 +436,38 @@ if (check (digest_tp3, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp3, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp3, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 3, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 3, 0, 0); \ } \ } \ } \ if (check (digest_tp4, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp4, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp4, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 4, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 4, 0, 0); \ } \ } \ } \ @@ -475,19 +475,19 @@ if (check (digest_tp5, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp5, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp5, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 5, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 5, 0, 0); \ } \ } \ } \ @@ -495,19 +495,19 @@ if (check (digest_tp6, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp6, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp6, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 6, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 6, 0, 0); \ } \ } \ } \ @@ -515,19 +515,19 @@ if (check (digest_tp7, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp7, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp7, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 7, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 7, 0, 0); \ } \ } \ } \ @@ -546,160 +546,160 @@ { \ if (((h0).s0 == search[0]) && ((h1).s0 == search[1]) && ((h2).s0 == search[2]) && ((h3).s0 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ \ if (((h0).s1 == search[0]) && ((h1).s1 == search[1]) && ((h2).s1 == search[2]) && ((h3).s1 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ \ if (((h0).s2 == search[0]) && ((h1).s2 == search[1]) && ((h2).s2 == search[2]) && ((h3).s2 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 2, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 2, 0, 0); \ } \ } \ \ if (((h0).s3 == search[0]) && ((h1).s3 == search[1]) && ((h2).s3 == search[2]) && ((h3).s3 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 3, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 3, 0, 0); \ } \ } \ if (((h0).s4 == search[0]) && ((h1).s4 == search[1]) && ((h2).s4 == search[2]) && ((h3).s4 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 4, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 4, 0, 0); \ } \ } \ \ if (((h0).s5 == search[0]) && ((h1).s5 == search[1]) && ((h2).s5 == search[2]) && ((h3).s5 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 5, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 5, 0, 0); \ } \ } \ \ if (((h0).s6 == search[0]) && ((h1).s6 == search[1]) && ((h2).s6 == search[2]) && ((h3).s6 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 6, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 6, 0, 0); \ } \ } \ \ if (((h0).s7 == search[0]) && ((h1).s7 == search[1]) && ((h2).s7 == search[2]) && ((h3).s7 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 7, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 7, 0, 0); \ } \ } \ \ if (((h0).s8 == search[0]) && ((h1).s8 == search[1]) && ((h2).s8 == search[2]) && ((h3).s8 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 8) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 8) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 8, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 8, 0, 0); \ } \ } \ \ if (((h0).s9 == search[0]) && ((h1).s9 == search[1]) && ((h2).s9 == search[2]) && ((h3).s9 == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 9) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 9) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 9, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 9, 0, 0); \ } \ } \ \ if (((h0).sa == search[0]) && ((h1).sa == search[1]) && ((h2).sa == search[2]) && ((h3).sa == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 10) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 10) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 10, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 10, 0, 0); \ } \ } \ \ if (((h0).sb == search[0]) && ((h1).sb == search[1]) && ((h2).sb == search[2]) && ((h3).sb == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 11) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 11) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 11, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 11, 0, 0); \ } \ } \ \ if (((h0).sc == search[0]) && ((h1).sc == search[1]) && ((h2).sc == search[2]) && ((h3).sc == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 12) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 12) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 12, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 12, 0, 0); \ } \ } \ \ if (((h0).sd == search[0]) && ((h1).sd == search[1]) && ((h2).sd == search[2]) && ((h3).sd == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 13) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 13) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 13, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 13, 0, 0); \ } \ } \ \ if (((h0).se == search[0]) && ((h1).se == search[1]) && ((h2).se == search[2]) && ((h3).se == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 14) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 14) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 14, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 14, 0, 0); \ } \ } \ \ if (((h0).sf == search[0]) && ((h1).sf == search[1]) && ((h2).sf == search[2]) && ((h3).sf == search[3])) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + 0; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + 0; \ \ - if (vector_accessible (il_pos, il_cnt, 15) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 15) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, final_hash_pos, gid, il_pos + 15, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, final_hash_pos, gid, il_pos + 15, 0, 0); \ } \ } \ } @@ -726,19 +726,19 @@ if (check (digest_tp00, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp00, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp00, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 0) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 0, 0, 0); \ } \ } \ } \ @@ -746,19 +746,19 @@ if (check (digest_tp01, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp01, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp01, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 1) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 1, 0, 0); \ } \ } \ } \ @@ -766,19 +766,19 @@ if (check (digest_tp02, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp02, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp02, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 2) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 2, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 2, 0, 0); \ } \ } \ } \ @@ -786,19 +786,19 @@ if (check (digest_tp03, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp03, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp03, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 3) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 3, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 3, 0, 0); \ } \ } \ } \ @@ -806,19 +806,19 @@ if (check (digest_tp04, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp04, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp04, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 4) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 4, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 4, 0, 0); \ } \ } \ } \ @@ -826,19 +826,19 @@ if (check (digest_tp05, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp05, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp05, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 5) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 5, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 5, 0, 0); \ } \ } \ } \ @@ -846,19 +846,19 @@ if (check (digest_tp06, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp06, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp06, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 6) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 6, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 6, 0, 0); \ } \ } \ } \ @@ -866,19 +866,19 @@ if (check (digest_tp07, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp07, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp07, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 7) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 7, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 7, 0, 0); \ } \ } \ } \ @@ -886,19 +886,19 @@ if (check (digest_tp08, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp08, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp08, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 8) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 8) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 8, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 8, 0, 0); \ } \ } \ } \ @@ -906,19 +906,19 @@ if (check (digest_tp09, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp09, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp09, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 9) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 9) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 9, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 9, 0, 0); \ } \ } \ } \ @@ -926,19 +926,19 @@ if (check (digest_tp10, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp10, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp10, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 10) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 10) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 10, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 10, 0, 0); \ } \ } \ } \ @@ -946,19 +946,19 @@ if (check (digest_tp11, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp11, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp11, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 11) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 11) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 11, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 11, 0, 0); \ } \ } \ } \ @@ -966,19 +966,19 @@ if (check (digest_tp12, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp12, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp12, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 12) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 12) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 12, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 12, 0, 0); \ } \ } \ } \ @@ -986,19 +986,19 @@ if (check (digest_tp13, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp13, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp13, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 13) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 13) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 13, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 13, 0, 0); \ } \ } \ } \ @@ -1006,19 +1006,19 @@ if (check (digest_tp14, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp14, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp14, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 14) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 14) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 14, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 14, 0, 0); \ } \ } \ } \ @@ -1026,19 +1026,19 @@ if (check (digest_tp15, \ bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, \ bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, \ - bitmap_mask, \ - bitmap_shift1, \ - bitmap_shift2)) \ + BITMAP_MASK, \ + BITMAP_SHIFT1, \ + BITMAP_SHIFT2)) \ { \ - int digest_pos = find_hash (digest_tp15, digests_cnt, &digests_buf[DIGESTS_OFFSET]); \ + int digest_pos = find_hash (digest_tp15, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); \ \ if (digest_pos != -1) \ { \ - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; \ + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; \ \ - if (vector_accessible (il_pos, il_cnt, 15) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ + if (vector_accessible (il_pos, IL_CNT, 15) && (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)) \ { \ - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos + 15, 0, 0); \ + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos + 15, 0, 0); \ } \ } \ } \ diff --git a/OpenCL/inc_types.h b/OpenCL/inc_types.h index 2cff4e0c8..9431c7ee7 100644 --- a/OpenCL/inc_types.h +++ b/OpenCL/inc_types.h @@ -7,13 +7,33 @@ #define _INC_TYPES_H #if ATTACK_MODE == 9 -#define SALT_POS (pws_pos + gid) -#define DIGESTS_CNT 1 -#define DIGESTS_OFFSET (pws_pos + gid) +#define BITMAP_MASK kernel_param->bitmap_mask +#define BITMAP_SHIFT1 kernel_param->bitmap_shift1 +#define BITMAP_SHIFT2 kernel_param->bitmap_shift2 +#define SALT_POS_HOST (pws_pos + gid) +#define LOOP_POS kernel_param->loop_pos +#define LOOP_CNT kernel_param->loop_cnt +#define IL_CNT kernel_param->il_cnt +#define DIGESTS_CNT 1 +#define DIGESTS_OFFSET_HOST (pws_pos + gid) +#define COMBS_MODE kernel_param->combs_mode +#define SALT_REPEAT kernel_param->salt_repeat +#define PWS_POS kernel_param->pws_pos +#define GID_MAX kernel_param->gid_max #else -#define SALT_POS salt_pos_host -#define DIGESTS_CNT digests_cnt_host -#define DIGESTS_OFFSET digests_offset_host +#define BITMAP_MASK kernel_param->bitmap_mask +#define BITMAP_SHIFT1 kernel_param->bitmap_shift1 +#define BITMAP_SHIFT2 kernel_param->bitmap_shift2 +#define SALT_POS_HOST kernel_param->salt_pos_host +#define LOOP_POS kernel_param->loop_pos +#define LOOP_CNT kernel_param->loop_cnt +#define IL_CNT kernel_param->il_cnt +#define DIGESTS_CNT kernel_param->digests_cnt +#define DIGESTS_OFFSET_HOST kernel_param->digests_offset_host +#define COMBS_MODE kernel_param->combs_mode +#define SALT_REPEAT kernel_param->salt_repeat +#define PWS_POS kernel_param->pws_pos +#define GID_MAX kernel_param->gid_max #endif #ifdef IS_CUDA @@ -1641,6 +1661,26 @@ typedef struct digest } digest_t; #endif +typedef struct kernel_param +{ + // We can only move attributes into this struct which do not use special declarations like __global + + u32 bitmap_mask; // 24 + u32 bitmap_shift1; // 25 + u32 bitmap_shift2; // 26 + u32 salt_pos_host; // 27 + u32 loop_pos; // 28 + u32 loop_cnt; // 29 + u32 il_cnt; // 30 + u32 digests_cnt; // 31 + u32 digests_offset_host; // 32 + u32 combs_mode; // 33 + u32 salt_repeat; // 34 + u64 pws_pos; // 35 + u64 gid_max; // 36 + +} kernel_param_t; + typedef struct salt { u32 salt_buf[64]; diff --git a/OpenCL/m00000_a0-optimized.cl b/OpenCL/m00000_a0-optimized.cl index 52f1341fa..2052d6bab 100644 --- a/OpenCL/m00000_a0-optimized.cl +++ b/OpenCL/m00000_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -165,7 +165,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -187,17 +187,17 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00000_a0-pure.cl b/OpenCL/m00000_a0-pure.cl index 5935e3cdd..d31fc5532 100644 --- a/OpenCL/m00000_a0-pure.cl +++ b/OpenCL/m00000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00000_a1-optimized.cl b/OpenCL/m00000_a1-optimized.cl index 5b9104093..fe108fad5 100644 --- a/OpenCL/m00000_a1-optimized.cl +++ b/OpenCL/m00000_a1-optimized.cl @@ -29,7 +29,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -49,7 +49,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -87,7 +87,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -223,7 +223,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -245,17 +245,17 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -293,7 +293,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00000_a1-pure.cl b/OpenCL/m00000_a1-pure.cl index 79e98d1df..f728d6cf5 100644 --- a/OpenCL/m00000_a1-pure.cl +++ b/OpenCL/m00000_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m00000_a3-optimized.cl b/OpenCL/m00000_a3-optimized.cl index bc18951c9..603f548ce 100644 --- a/OpenCL/m00000_a3-optimized.cl +++ b/OpenCL/m00000_a3-optimized.cl @@ -118,7 +118,7 @@ DECLSPEC void m00000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -290,20 +290,20 @@ DECLSPEC void m00000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD5_STEP_REV (MD5_I_S, b_rev, c_rev, d_rev, a_rev, w[ 9], MD5C3f, MD5S33); MD5_STEP_REV (MD5_I_S, c_rev, d_rev, a_rev, b_rev, w[ 2], MD5C3e, MD5S32); @@ -333,7 +333,7 @@ DECLSPEC void m00000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -437,7 +437,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -464,7 +464,7 @@ KERNEL_FQ void m00000_m04 (KERN_ATTR_VECTOR ()) * main */ - m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00000_m08 (KERN_ATTR_VECTOR ()) @@ -475,7 +475,7 @@ KERNEL_FQ void m00000_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -502,7 +502,7 @@ KERNEL_FQ void m00000_m08 (KERN_ATTR_VECTOR ()) * main */ - m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00000_m16 (KERN_ATTR_VECTOR ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m00000_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -540,7 +540,7 @@ KERNEL_FQ void m00000_m16 (KERN_ATTR_VECTOR ()) * main */ - m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00000_s04 (KERN_ATTR_VECTOR ()) @@ -551,7 +551,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -578,7 +578,7 @@ KERNEL_FQ void m00000_s04 (KERN_ATTR_VECTOR ()) * main */ - m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00000_s08 (KERN_ATTR_VECTOR ()) @@ -589,7 +589,7 @@ KERNEL_FQ void m00000_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -616,7 +616,7 @@ KERNEL_FQ void m00000_s08 (KERN_ATTR_VECTOR ()) * main */ - m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00000_s16 (KERN_ATTR_VECTOR ()) @@ -627,7 +627,7 @@ KERNEL_FQ void m00000_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -654,5 +654,5 @@ KERNEL_FQ void m00000_s16 (KERN_ATTR_VECTOR ()) * main */ - m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00000_a3-pure.cl b/OpenCL/m00000_a3-pure.cl index da4b1cebe..566cfb4e8 100644 --- a/OpenCL/m00000_a3-pure.cl +++ b/OpenCL/m00000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m00000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m00000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00010_a0-optimized.cl b/OpenCL/m00010_a0-optimized.cl index 683405dc8..14ef9bb94 100644 --- a/OpenCL/m00010_a0-optimized.cl +++ b/OpenCL/m00010_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -239,7 +239,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -264,24 +264,24 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -289,17 +289,17 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00010_a0-pure.cl b/OpenCL/m00010_a0-pure.cl index 859b1114a..2c447c59b 100644 --- a/OpenCL/m00010_a0-pure.cl +++ b/OpenCL/m00010_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00010_a1-optimized.cl b/OpenCL/m00010_a1-optimized.cl index 64173871f..53820e945 100644 --- a/OpenCL/m00010_a1-optimized.cl +++ b/OpenCL/m00010_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -297,7 +297,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -322,24 +322,24 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -347,17 +347,17 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -395,7 +395,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00010_a1-pure.cl b/OpenCL/m00010_a1-pure.cl index 0625577ba..6d3f87384 100644 --- a/OpenCL/m00010_a1-pure.cl +++ b/OpenCL/m00010_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m00010_a3-optimized.cl b/OpenCL/m00010_a3-optimized.cl index cbea16ddb..487f91fd8 100644 --- a/OpenCL/m00010_a3-optimized.cl +++ b/OpenCL/m00010_a3-optimized.cl @@ -49,24 +49,24 @@ DECLSPEC void m00010m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -167,7 +167,7 @@ DECLSPEC void m00010m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -339,20 +339,20 @@ DECLSPEC void m00010s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD5_STEP_REV (MD5_I_S, b_rev, c_rev, d_rev, a_rev, w[ 9], MD5C3f, MD5S33); MD5_STEP_REV (MD5_I_S, c_rev, d_rev, a_rev, b_rev, w[ 2], MD5C3e, MD5S32); @@ -382,7 +382,7 @@ DECLSPEC void m00010s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -486,7 +486,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -513,7 +513,7 @@ KERNEL_FQ void m00010_m04 (KERN_ATTR_VECTOR ()) * main */ - m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00010_m08 (KERN_ATTR_VECTOR ()) @@ -524,7 +524,7 @@ KERNEL_FQ void m00010_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -551,7 +551,7 @@ KERNEL_FQ void m00010_m08 (KERN_ATTR_VECTOR ()) * main */ - m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00010_m16 (KERN_ATTR_VECTOR ()) @@ -562,7 +562,7 @@ KERNEL_FQ void m00010_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -589,7 +589,7 @@ KERNEL_FQ void m00010_m16 (KERN_ATTR_VECTOR ()) * main */ - m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00010_s04 (KERN_ATTR_VECTOR ()) @@ -600,7 +600,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -627,7 +627,7 @@ KERNEL_FQ void m00010_s04 (KERN_ATTR_VECTOR ()) * main */ - m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00010_s08 (KERN_ATTR_VECTOR ()) @@ -638,7 +638,7 @@ KERNEL_FQ void m00010_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -665,7 +665,7 @@ KERNEL_FQ void m00010_s08 (KERN_ATTR_VECTOR ()) * main */ - m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00010_s16 (KERN_ATTR_VECTOR ()) @@ -676,7 +676,7 @@ KERNEL_FQ void m00010_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -703,5 +703,5 @@ KERNEL_FQ void m00010_s16 (KERN_ATTR_VECTOR ()) * main */ - m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00010_a3-pure.cl b/OpenCL/m00010_a3-pure.cl index dbcf6ce1e..163e7cb64 100644 --- a/OpenCL/m00010_a3-pure.cl +++ b/OpenCL/m00010_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m00010_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m00010_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00020_a0-optimized.cl b/OpenCL/m00020_a0-optimized.cl index ee1299ce2..4bf41989a 100644 --- a/OpenCL/m00020_a0-optimized.cl +++ b/OpenCL/m00020_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -219,7 +219,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -244,24 +244,24 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -269,17 +269,17 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00020_a0-pure.cl b/OpenCL/m00020_a0-pure.cl index 9d5bfb464..b282c61fa 100644 --- a/OpenCL/m00020_a0-pure.cl +++ b/OpenCL/m00020_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00020_a1-optimized.cl b/OpenCL/m00020_a1-optimized.cl index be07636fb..13b6735ad 100644 --- a/OpenCL/m00020_a1-optimized.cl +++ b/OpenCL/m00020_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -275,7 +275,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -300,24 +300,24 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -325,17 +325,17 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -373,7 +373,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00020_a1-pure.cl b/OpenCL/m00020_a1-pure.cl index 7ee265892..a2583c80e 100644 --- a/OpenCL/m00020_a1-pure.cl +++ b/OpenCL/m00020_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m00020_a3-optimized.cl b/OpenCL/m00020_a3-optimized.cl index 3e962a671..8157bb151 100644 --- a/OpenCL/m00020_a3-optimized.cl +++ b/OpenCL/m00020_a3-optimized.cl @@ -32,24 +32,24 @@ DECLSPEC void m00020m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -59,7 +59,7 @@ DECLSPEC void m00020m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -204,10 +204,10 @@ DECLSPEC void m00020s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -219,24 +219,24 @@ DECLSPEC void m00020s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -246,7 +246,7 @@ DECLSPEC void m00020s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -387,7 +387,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -423,7 +423,7 @@ KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) * main */ - m00020m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00020m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00020_m08 (KERN_ATTR_BASIC ()) @@ -434,7 +434,7 @@ KERNEL_FQ void m00020_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -470,7 +470,7 @@ KERNEL_FQ void m00020_m08 (KERN_ATTR_BASIC ()) * main */ - m00020m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00020m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00020_m16 (KERN_ATTR_BASIC ()) @@ -481,7 +481,7 @@ KERNEL_FQ void m00020_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -517,7 +517,7 @@ KERNEL_FQ void m00020_m16 (KERN_ATTR_BASIC ()) * main */ - m00020m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00020m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) @@ -528,7 +528,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -564,7 +564,7 @@ KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) * main */ - m00020s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00020s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00020_s08 (KERN_ATTR_BASIC ()) @@ -575,7 +575,7 @@ KERNEL_FQ void m00020_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -611,7 +611,7 @@ KERNEL_FQ void m00020_s08 (KERN_ATTR_BASIC ()) * main */ - m00020s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00020s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00020_s16 (KERN_ATTR_BASIC ()) @@ -622,7 +622,7 @@ KERNEL_FQ void m00020_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -658,5 +658,5 @@ KERNEL_FQ void m00020_s16 (KERN_ATTR_BASIC ()) * main */ - m00020s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00020s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00020_a3-pure.cl b/OpenCL/m00020_a3-pure.cl index 8a4d07ef6..5544620af 100644 --- a/OpenCL/m00020_a3-pure.cl +++ b/OpenCL/m00020_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m00020_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m00020_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00030_a0-optimized.cl b/OpenCL/m00030_a0-optimized.cl index fbf615a42..85cbca6a4 100644 --- a/OpenCL/m00030_a0-optimized.cl +++ b/OpenCL/m00030_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -244,7 +244,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -269,24 +269,24 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -294,17 +294,17 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00030_a0-pure.cl b/OpenCL/m00030_a0-pure.cl index c9a3c36dd..253bf413a 100644 --- a/OpenCL/m00030_a0-pure.cl +++ b/OpenCL/m00030_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00030_a1-optimized.cl b/OpenCL/m00030_a1-optimized.cl index 38619a22c..46d07dd18 100644 --- a/OpenCL/m00030_a1-optimized.cl +++ b/OpenCL/m00030_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -302,7 +302,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -327,24 +327,24 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -352,17 +352,17 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -400,7 +400,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00030_a1-pure.cl b/OpenCL/m00030_a1-pure.cl index 356a2dbd6..2769af047 100644 --- a/OpenCL/m00030_a1-pure.cl +++ b/OpenCL/m00030_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m00030_a3-optimized.cl b/OpenCL/m00030_a3-optimized.cl index c39666ab6..210923966 100644 --- a/OpenCL/m00030_a3-optimized.cl +++ b/OpenCL/m00030_a3-optimized.cl @@ -49,24 +49,24 @@ DECLSPEC void m00030m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -167,7 +167,7 @@ DECLSPEC void m00030m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -339,20 +339,20 @@ DECLSPEC void m00030s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD5_STEP_REV (MD5_I_S, b_rev, c_rev, d_rev, a_rev, w[ 9], MD5C3f, MD5S33); MD5_STEP_REV (MD5_I_S, c_rev, d_rev, a_rev, b_rev, w[ 2], MD5C3e, MD5S32); @@ -382,7 +382,7 @@ DECLSPEC void m00030s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -486,7 +486,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -513,7 +513,7 @@ KERNEL_FQ void m00030_m04 (KERN_ATTR_VECTOR ()) * main */ - m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00030_m08 (KERN_ATTR_VECTOR ()) @@ -524,7 +524,7 @@ KERNEL_FQ void m00030_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -551,7 +551,7 @@ KERNEL_FQ void m00030_m08 (KERN_ATTR_VECTOR ()) * main */ - m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00030_m16 (KERN_ATTR_VECTOR ()) @@ -562,7 +562,7 @@ KERNEL_FQ void m00030_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -589,7 +589,7 @@ KERNEL_FQ void m00030_m16 (KERN_ATTR_VECTOR ()) * main */ - m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00030_s04 (KERN_ATTR_VECTOR ()) @@ -600,7 +600,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -627,7 +627,7 @@ KERNEL_FQ void m00030_s04 (KERN_ATTR_VECTOR ()) * main */ - m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00030_s08 (KERN_ATTR_VECTOR ()) @@ -638,7 +638,7 @@ KERNEL_FQ void m00030_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -665,7 +665,7 @@ KERNEL_FQ void m00030_s08 (KERN_ATTR_VECTOR ()) * main */ - m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00030_s16 (KERN_ATTR_VECTOR ()) @@ -676,7 +676,7 @@ KERNEL_FQ void m00030_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -703,5 +703,5 @@ KERNEL_FQ void m00030_s16 (KERN_ATTR_VECTOR ()) * main */ - m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00030_a3-pure.cl b/OpenCL/m00030_a3-pure.cl index 6ad93a21c..de1f296af 100644 --- a/OpenCL/m00030_a3-pure.cl +++ b/OpenCL/m00030_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m00030_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m00030_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00040_a0-optimized.cl b/OpenCL/m00040_a0-optimized.cl index 02bf4b3d3..4de081c58 100644 --- a/OpenCL/m00040_a0-optimized.cl +++ b/OpenCL/m00040_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -224,7 +224,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -249,24 +249,24 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -274,17 +274,17 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00040_a0-pure.cl b/OpenCL/m00040_a0-pure.cl index 90cdfea1d..a2f7a7ae3 100644 --- a/OpenCL/m00040_a0-pure.cl +++ b/OpenCL/m00040_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00040_a1-optimized.cl b/OpenCL/m00040_a1-optimized.cl index 9cb03143f..bcbbc3655 100644 --- a/OpenCL/m00040_a1-optimized.cl +++ b/OpenCL/m00040_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -280,7 +280,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -305,24 +305,24 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -330,17 +330,17 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -378,7 +378,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00040_a1-pure.cl b/OpenCL/m00040_a1-pure.cl index 97916d376..efaee0041 100644 --- a/OpenCL/m00040_a1-pure.cl +++ b/OpenCL/m00040_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global_utf16le (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global_utf16le (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m00040_a3-optimized.cl b/OpenCL/m00040_a3-optimized.cl index 5a8563b1f..a886b0b55 100644 --- a/OpenCL/m00040_a3-optimized.cl +++ b/OpenCL/m00040_a3-optimized.cl @@ -32,24 +32,24 @@ DECLSPEC void m00040m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -59,7 +59,7 @@ DECLSPEC void m00040m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -204,10 +204,10 @@ DECLSPEC void m00040s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -219,24 +219,24 @@ DECLSPEC void m00040s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -246,7 +246,7 @@ DECLSPEC void m00040s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -387,7 +387,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -423,7 +423,7 @@ KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) * main */ - m00040m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00040m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00040_m08 (KERN_ATTR_BASIC ()) @@ -434,7 +434,7 @@ KERNEL_FQ void m00040_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -470,7 +470,7 @@ KERNEL_FQ void m00040_m08 (KERN_ATTR_BASIC ()) * main */ - m00040m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00040m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00040_m16 (KERN_ATTR_BASIC ()) @@ -481,7 +481,7 @@ KERNEL_FQ void m00040_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -517,7 +517,7 @@ KERNEL_FQ void m00040_m16 (KERN_ATTR_BASIC ()) * main */ - m00040m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00040m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) @@ -528,7 +528,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -564,7 +564,7 @@ KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) * main */ - m00040s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00040s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00040_s08 (KERN_ATTR_BASIC ()) @@ -575,7 +575,7 @@ KERNEL_FQ void m00040_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -611,7 +611,7 @@ KERNEL_FQ void m00040_s08 (KERN_ATTR_BASIC ()) * main */ - m00040s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00040s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00040_s16 (KERN_ATTR_BASIC ()) @@ -622,7 +622,7 @@ KERNEL_FQ void m00040_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -658,5 +658,5 @@ KERNEL_FQ void m00040_s16 (KERN_ATTR_BASIC ()) * main */ - m00040s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00040s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00040_a3-pure.cl b/OpenCL/m00040_a3-pure.cl index 9608e9a2e..95b0300c2 100644 --- a/OpenCL/m00040_a3-pure.cl +++ b/OpenCL/m00040_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m00040_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m00040_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00050_a0-optimized.cl b/OpenCL/m00050_a0-optimized.cl index 4c161b5c2..60d4bb3b0 100644 --- a/OpenCL/m00050_a0-optimized.cl +++ b/OpenCL/m00050_a0-optimized.cl @@ -115,7 +115,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -140,30 +140,30 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -228,7 +228,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -253,24 +253,24 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -278,17 +278,17 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00050_a0-pure.cl b/OpenCL/m00050_a0-pure.cl index 2ce633773..4162b0703 100644 --- a/OpenCL/m00050_a0-pure.cl +++ b/OpenCL/m00050_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -78,7 +78,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -98,20 +98,20 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00050_a1-optimized.cl b/OpenCL/m00050_a1-optimized.cl index 664ba42f9..29c8a1659 100644 --- a/OpenCL/m00050_a1-optimized.cl +++ b/OpenCL/m00050_a1-optimized.cl @@ -113,7 +113,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -138,30 +138,30 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -199,7 +199,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -286,7 +286,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -311,24 +311,24 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -336,17 +336,17 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -384,7 +384,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00050_a1-pure.cl b/OpenCL/m00050_a1-pure.cl index 553aa4ad3..252c422d8 100644 --- a/OpenCL/m00050_a1-pure.cl +++ b/OpenCL/m00050_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_BASIC ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -101,7 +101,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -128,20 +128,20 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_BASIC ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m00050_a3-optimized.cl b/OpenCL/m00050_a3-optimized.cl index 16fa863dd..48345d666 100644 --- a/OpenCL/m00050_a3-optimized.cl +++ b/OpenCL/m00050_a3-optimized.cl @@ -117,24 +117,24 @@ DECLSPEC void m00050m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -142,7 +142,7 @@ DECLSPEC void m00050m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -222,24 +222,24 @@ DECLSPEC void m00050s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -247,10 +247,10 @@ DECLSPEC void m00050s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -259,7 +259,7 @@ DECLSPEC void m00050s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -329,7 +329,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -365,7 +365,7 @@ KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) * main */ - m00050m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00050m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00050_m08 (KERN_ATTR_BASIC ()) @@ -376,7 +376,7 @@ KERNEL_FQ void m00050_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -412,7 +412,7 @@ KERNEL_FQ void m00050_m08 (KERN_ATTR_BASIC ()) * main */ - m00050m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00050m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00050_m16 (KERN_ATTR_BASIC ()) @@ -423,7 +423,7 @@ KERNEL_FQ void m00050_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -459,7 +459,7 @@ KERNEL_FQ void m00050_m16 (KERN_ATTR_BASIC ()) * main */ - m00050m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00050m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) @@ -470,7 +470,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -506,7 +506,7 @@ KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) * main */ - m00050s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00050s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00050_s08 (KERN_ATTR_BASIC ()) @@ -517,7 +517,7 @@ KERNEL_FQ void m00050_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -553,7 +553,7 @@ KERNEL_FQ void m00050_s08 (KERN_ATTR_BASIC ()) * main */ - m00050s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00050s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00050_s16 (KERN_ATTR_BASIC ()) @@ -564,7 +564,7 @@ KERNEL_FQ void m00050_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -600,5 +600,5 @@ KERNEL_FQ void m00050_s16 (KERN_ATTR_BASIC ()) * main */ - m00050s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00050s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00050_a3-pure.cl b/OpenCL/m00050_a3-pure.cl index 09dd841a8..f20dbdc7c 100644 --- a/OpenCL/m00050_a3-pure.cl +++ b/OpenCL/m00050_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m00050_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -87,7 +87,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -114,13 +114,13 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -129,7 +129,7 @@ KERNEL_FQ void m00050_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl index 08bda4dfb..0c8aeb59d 100644 --- a/OpenCL/m00060_a0-optimized.cl +++ b/OpenCL/m00060_a0-optimized.cl @@ -115,7 +115,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -140,22 +140,22 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; /** * pads @@ -192,7 +192,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -250,7 +250,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -275,22 +275,22 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; /** * pads @@ -329,17 +329,17 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00060_a0-pure.cl b/OpenCL/m00060_a0-pure.cl index 253d9aa4e..7a43646bb 100644 --- a/OpenCL/m00060_a0-pure.cl +++ b/OpenCL/m00060_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_hmac_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,13 +100,13 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_hmac_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00060_a1-optimized.cl b/OpenCL/m00060_a1-optimized.cl index efc122955..b2d5b5e88 100644 --- a/OpenCL/m00060_a1-optimized.cl +++ b/OpenCL/m00060_a1-optimized.cl @@ -113,7 +113,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -138,22 +138,22 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; /** * pads @@ -190,7 +190,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -228,7 +228,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -289,7 +289,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -314,22 +314,22 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; /** * pads @@ -368,17 +368,17 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -416,7 +416,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00060_a1-pure.cl b/OpenCL/m00060_a1-pure.cl index 87f1d61c1..663cefebc 100644 --- a/OpenCL/m00060_a1-pure.cl +++ b/OpenCL/m00060_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_BASIC ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_hmac_ctx_t ctx0; @@ -55,7 +55,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -103,7 +103,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -111,10 +111,10 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -130,13 +130,13 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_BASIC ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_hmac_ctx_t ctx0; @@ -147,7 +147,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m00060_a3-optimized.cl b/OpenCL/m00060_a3-optimized.cl index 4121c3293..3fe821771 100644 --- a/OpenCL/m00060_a3-optimized.cl +++ b/OpenCL/m00060_a3-optimized.cl @@ -117,22 +117,22 @@ DECLSPEC void m00060m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; /** * pads @@ -171,7 +171,7 @@ DECLSPEC void m00060m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -220,22 +220,22 @@ DECLSPEC void m00060s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; /** * pads @@ -274,10 +274,10 @@ DECLSPEC void m00060s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -286,7 +286,7 @@ DECLSPEC void m00060s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -325,7 +325,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -361,7 +361,7 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) * main */ - m00060m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00060m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00060_m08 (KERN_ATTR_BASIC ()) @@ -372,7 +372,7 @@ KERNEL_FQ void m00060_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -408,7 +408,7 @@ KERNEL_FQ void m00060_m08 (KERN_ATTR_BASIC ()) * main */ - m00060m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00060m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00060_m16 (KERN_ATTR_BASIC ()) @@ -419,7 +419,7 @@ KERNEL_FQ void m00060_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m00060_m16 (KERN_ATTR_BASIC ()) * main */ - m00060m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00060m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) * main */ - m00060s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00060s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00060_s08 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m00060_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m00060_s08 (KERN_ATTR_BASIC ()) * main */ - m00060s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00060s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00060_s16 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m00060_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,5 +596,5 @@ KERNEL_FQ void m00060_s16 (KERN_ATTR_BASIC ()) * main */ - m00060s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00060s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00060_a3-pure.cl b/OpenCL/m00060_a3-pure.cl index af7c364a5..5ebed2ca7 100644 --- a/OpenCL/m00060_a3-pure.cl +++ b/OpenCL/m00060_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_hmac_ctx_vector_t ctx0; @@ -57,7 +57,7 @@ KERNEL_FQ void m00060_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_hmac_ctx_vector_t ctx0; @@ -135,7 +135,7 @@ KERNEL_FQ void m00060_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00070_a0-optimized.cl b/OpenCL/m00070_a0-optimized.cl index 4b4f0a915..4c24f1c6c 100644 --- a/OpenCL/m00070_a0-optimized.cl +++ b/OpenCL/m00070_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -174,7 +174,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -196,17 +196,17 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00070_a0-pure.cl b/OpenCL/m00070_a0-pure.cl index d39773fef..1b6a7a56c 100644 --- a/OpenCL/m00070_a0-pure.cl +++ b/OpenCL/m00070_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00070_a1-optimized.cl b/OpenCL/m00070_a1-optimized.cl index 18500db3a..f66eeee8d 100644 --- a/OpenCL/m00070_a1-optimized.cl +++ b/OpenCL/m00070_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -232,7 +232,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -254,17 +254,17 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -302,7 +302,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00070_a1-pure.cl b/OpenCL/m00070_a1-pure.cl index 37616a484..96f50effe 100644 --- a/OpenCL/m00070_a1-pure.cl +++ b/OpenCL/m00070_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m00070_a3-optimized.cl b/OpenCL/m00070_a3-optimized.cl index daff21ace..cff809797 100644 --- a/OpenCL/m00070_a3-optimized.cl +++ b/OpenCL/m00070_a3-optimized.cl @@ -121,7 +121,7 @@ DECLSPEC void m00070m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -293,20 +293,20 @@ DECLSPEC void m00070s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD5_STEP_REV (MD5_I_S, b_rev, c_rev, d_rev, a_rev, w[ 9], MD5C3f, MD5S33); MD5_STEP_REV (MD5_I_S, c_rev, d_rev, a_rev, b_rev, w[ 2], MD5C3e, MD5S32); @@ -336,7 +336,7 @@ DECLSPEC void m00070s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -440,7 +440,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -467,7 +467,7 @@ KERNEL_FQ void m00070_m04 (KERN_ATTR_VECTOR ()) * main */ - m00070m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00070m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00070_m08 (KERN_ATTR_VECTOR ()) @@ -478,7 +478,7 @@ KERNEL_FQ void m00070_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -505,7 +505,7 @@ KERNEL_FQ void m00070_m08 (KERN_ATTR_VECTOR ()) * main */ - m00070m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00070m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00070_m16 (KERN_ATTR_VECTOR ()) @@ -516,7 +516,7 @@ KERNEL_FQ void m00070_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -543,7 +543,7 @@ KERNEL_FQ void m00070_m16 (KERN_ATTR_VECTOR ()) * main */ - m00070m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00070m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00070_s04 (KERN_ATTR_VECTOR ()) @@ -554,7 +554,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -581,7 +581,7 @@ KERNEL_FQ void m00070_s04 (KERN_ATTR_VECTOR ()) * main */ - m00070s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00070s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00070_s08 (KERN_ATTR_VECTOR ()) @@ -592,7 +592,7 @@ KERNEL_FQ void m00070_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -619,7 +619,7 @@ KERNEL_FQ void m00070_s08 (KERN_ATTR_VECTOR ()) * main */ - m00070s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00070s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00070_s16 (KERN_ATTR_VECTOR ()) @@ -630,7 +630,7 @@ KERNEL_FQ void m00070_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -657,5 +657,5 @@ KERNEL_FQ void m00070_s16 (KERN_ATTR_VECTOR ()) * main */ - m00070s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00070s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00070_a3-pure.cl b/OpenCL/m00070_a3-pure.cl index 76658f980..bad529a39 100644 --- a/OpenCL/m00070_a3-pure.cl +++ b/OpenCL/m00070_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m00070_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m00070_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00100_a0-optimized.cl b/OpenCL/m00100_a0-optimized.cl index 54965a1b7..d09569f09 100644 --- a/OpenCL/m00100_a0-optimized.cl +++ b/OpenCL/m00100_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -210,7 +210,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -232,10 +232,10 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -248,7 +248,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00100_a0-pure.cl b/OpenCL/m00100_a0-pure.cl index 5c50cc075..27f2b8b82 100644 --- a/OpenCL/m00100_a0-pure.cl +++ b/OpenCL/m00100_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00100_a1-optimized.cl b/OpenCL/m00100_a1-optimized.cl index a0b6a8e02..316acc346 100644 --- a/OpenCL/m00100_a1-optimized.cl +++ b/OpenCL/m00100_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -266,7 +266,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -288,10 +288,10 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -304,7 +304,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -342,7 +342,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00100_a1-pure.cl b/OpenCL/m00100_a1-pure.cl index db6fec17b..41c875984 100644 --- a/OpenCL/m00100_a1-pure.cl +++ b/OpenCL/m00100_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m00100_a3-optimized.cl b/OpenCL/m00100_a3-optimized.cl index cabb04e0c..b40e940d1 100644 --- a/OpenCL/m00100_a3-optimized.cl +++ b/OpenCL/m00100_a3-optimized.cl @@ -110,7 +110,7 @@ DECLSPEC void m00100m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -354,10 +354,10 @@ DECLSPEC void m00100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -372,7 +372,7 @@ DECLSPEC void m00100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -530,7 +530,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -557,7 +557,7 @@ KERNEL_FQ void m00100_m04 (KERN_ATTR_VECTOR ()) * main */ - m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00100_m08 (KERN_ATTR_VECTOR ()) @@ -568,7 +568,7 @@ KERNEL_FQ void m00100_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -595,7 +595,7 @@ KERNEL_FQ void m00100_m08 (KERN_ATTR_VECTOR ()) * main */ - m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00100_m16 (KERN_ATTR_VECTOR ()) @@ -606,7 +606,7 @@ KERNEL_FQ void m00100_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -633,7 +633,7 @@ KERNEL_FQ void m00100_m16 (KERN_ATTR_VECTOR ()) * main */ - m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00100_s04 (KERN_ATTR_VECTOR ()) @@ -644,7 +644,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -671,7 +671,7 @@ KERNEL_FQ void m00100_s04 (KERN_ATTR_VECTOR ()) * main */ - m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00100_s08 (KERN_ATTR_VECTOR ()) @@ -682,7 +682,7 @@ KERNEL_FQ void m00100_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -709,7 +709,7 @@ KERNEL_FQ void m00100_s08 (KERN_ATTR_VECTOR ()) * main */ - m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00100_s16 (KERN_ATTR_VECTOR ()) @@ -720,7 +720,7 @@ KERNEL_FQ void m00100_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -747,5 +747,5 @@ KERNEL_FQ void m00100_s16 (KERN_ATTR_VECTOR ()) * main */ - m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00100_a3-pure.cl b/OpenCL/m00100_a3-pure.cl index 9149921fc..aa6a59509 100644 --- a/OpenCL/m00100_a3-pure.cl +++ b/OpenCL/m00100_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m00100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m00100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00110_a0-optimized.cl b/OpenCL/m00110_a0-optimized.cl index cfb0ab6fe..374394e9e 100644 --- a/OpenCL/m00110_a0-optimized.cl +++ b/OpenCL/m00110_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -283,7 +283,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -308,24 +308,24 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -333,10 +333,10 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -349,7 +349,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00110_a0-pure.cl b/OpenCL/m00110_a0-pure.cl index e2046fb7e..a43c9a45f 100644 --- a/OpenCL/m00110_a0-pure.cl +++ b/OpenCL/m00110_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00110_a1-optimized.cl b/OpenCL/m00110_a1-optimized.cl index 842270483..1cc088254 100644 --- a/OpenCL/m00110_a1-optimized.cl +++ b/OpenCL/m00110_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -341,7 +341,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -366,24 +366,24 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -391,10 +391,10 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -407,7 +407,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -445,7 +445,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00110_a1-pure.cl b/OpenCL/m00110_a1-pure.cl index 6935371dd..a105fca51 100644 --- a/OpenCL/m00110_a1-pure.cl +++ b/OpenCL/m00110_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m00110_a3-optimized.cl b/OpenCL/m00110_a3-optimized.cl index b96c47fd5..65727e73a 100644 --- a/OpenCL/m00110_a3-optimized.cl +++ b/OpenCL/m00110_a3-optimized.cl @@ -32,22 +32,22 @@ DECLSPEC void m00110m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -68,7 +68,7 @@ DECLSPEC void m00110m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m00110m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -402,10 +402,10 @@ DECLSPEC void m00110s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -420,7 +420,7 @@ DECLSPEC void m00110s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -578,7 +578,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -605,7 +605,7 @@ KERNEL_FQ void m00110_m04 (KERN_ATTR_VECTOR ()) * main */ - m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00110_m08 (KERN_ATTR_VECTOR ()) @@ -616,7 +616,7 @@ KERNEL_FQ void m00110_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -643,7 +643,7 @@ KERNEL_FQ void m00110_m08 (KERN_ATTR_VECTOR ()) * main */ - m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00110_m16 (KERN_ATTR_VECTOR ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m00110_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -681,7 +681,7 @@ KERNEL_FQ void m00110_m16 (KERN_ATTR_VECTOR ()) * main */ - m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00110_s04 (KERN_ATTR_VECTOR ()) @@ -692,7 +692,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -719,7 +719,7 @@ KERNEL_FQ void m00110_s04 (KERN_ATTR_VECTOR ()) * main */ - m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00110_s08 (KERN_ATTR_VECTOR ()) @@ -730,7 +730,7 @@ KERNEL_FQ void m00110_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -757,7 +757,7 @@ KERNEL_FQ void m00110_s08 (KERN_ATTR_VECTOR ()) * main */ - m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00110_s16 (KERN_ATTR_VECTOR ()) @@ -768,7 +768,7 @@ KERNEL_FQ void m00110_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -795,5 +795,5 @@ KERNEL_FQ void m00110_s16 (KERN_ATTR_VECTOR ()) * main */ - m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00110_a3-pure.cl b/OpenCL/m00110_a3-pure.cl index 881b66196..b0b2666f1 100644 --- a/OpenCL/m00110_a3-pure.cl +++ b/OpenCL/m00110_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m00110_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m00110_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00120_a0-optimized.cl b/OpenCL/m00120_a0-optimized.cl index df5eecb60..24577c57d 100644 --- a/OpenCL/m00120_a0-optimized.cl +++ b/OpenCL/m00120_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,24 +55,24 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -80,17 +80,17 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -275,7 +275,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -300,24 +300,24 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -325,10 +325,10 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -341,7 +341,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00120_a0-pure.cl b/OpenCL/m00120_a0-pure.cl index e45201761..a2cd2c535 100644 --- a/OpenCL/m00120_a0-pure.cl +++ b/OpenCL/m00120_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00120_a1-optimized.cl b/OpenCL/m00120_a1-optimized.cl index d5e6a321a..a276bfbfd 100644 --- a/OpenCL/m00120_a1-optimized.cl +++ b/OpenCL/m00120_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,24 +53,24 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -78,17 +78,17 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -126,7 +126,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -331,7 +331,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -356,24 +356,24 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -381,10 +381,10 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -397,7 +397,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -435,7 +435,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00120_a1-pure.cl b/OpenCL/m00120_a1-pure.cl index 1e66fb72b..4cfd66b66 100644 --- a/OpenCL/m00120_a1-pure.cl +++ b/OpenCL/m00120_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m00120_a3-optimized.cl b/OpenCL/m00120_a3-optimized.cl index 37ad4b0d8..a8f45ec1f 100644 --- a/OpenCL/m00120_a3-optimized.cl +++ b/OpenCL/m00120_a3-optimized.cl @@ -32,24 +32,24 @@ DECLSPEC void m00120m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -59,7 +59,7 @@ DECLSPEC void m00120m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -248,10 +248,10 @@ DECLSPEC void m00120s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -269,24 +269,24 @@ DECLSPEC void m00120s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -296,7 +296,7 @@ DECLSPEC void m00120s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -481,7 +481,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -517,7 +517,7 @@ KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) * main */ - m00120m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00120m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00120_m08 (KERN_ATTR_BASIC ()) @@ -528,7 +528,7 @@ KERNEL_FQ void m00120_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -564,7 +564,7 @@ KERNEL_FQ void m00120_m08 (KERN_ATTR_BASIC ()) * main */ - m00120m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00120m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00120_m16 (KERN_ATTR_BASIC ()) @@ -575,7 +575,7 @@ KERNEL_FQ void m00120_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -611,7 +611,7 @@ KERNEL_FQ void m00120_m16 (KERN_ATTR_BASIC ()) * main */ - m00120m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00120m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) @@ -622,7 +622,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -658,7 +658,7 @@ KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) * main */ - m00120s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00120s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00120_s08 (KERN_ATTR_BASIC ()) @@ -669,7 +669,7 @@ KERNEL_FQ void m00120_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -705,7 +705,7 @@ KERNEL_FQ void m00120_s08 (KERN_ATTR_BASIC ()) * main */ - m00120s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00120s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00120_s16 (KERN_ATTR_BASIC ()) @@ -716,7 +716,7 @@ KERNEL_FQ void m00120_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -752,5 +752,5 @@ KERNEL_FQ void m00120_s16 (KERN_ATTR_BASIC ()) * main */ - m00120s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00120s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00120_a3-pure.cl b/OpenCL/m00120_a3-pure.cl index 6f105ac5d..9e282f2a9 100644 --- a/OpenCL/m00120_a3-pure.cl +++ b/OpenCL/m00120_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m00120_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m00120_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00130_a0-optimized.cl b/OpenCL/m00130_a0-optimized.cl index 8f97b729f..b62bbf71a 100644 --- a/OpenCL/m00130_a0-optimized.cl +++ b/OpenCL/m00130_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -288,7 +288,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -313,24 +313,24 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -338,10 +338,10 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -354,7 +354,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00130_a0-pure.cl b/OpenCL/m00130_a0-pure.cl index 7fdb81cb4..ff6f7d0c1 100644 --- a/OpenCL/m00130_a0-pure.cl +++ b/OpenCL/m00130_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00130_a1-optimized.cl b/OpenCL/m00130_a1-optimized.cl index 6783e7234..81d1d80eb 100644 --- a/OpenCL/m00130_a1-optimized.cl +++ b/OpenCL/m00130_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -346,7 +346,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -371,24 +371,24 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -396,10 +396,10 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -412,7 +412,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -450,7 +450,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00130_a1-pure.cl b/OpenCL/m00130_a1-pure.cl index 9c38c93c6..d9d9f858d 100644 --- a/OpenCL/m00130_a1-pure.cl +++ b/OpenCL/m00130_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m00130_a3-optimized.cl b/OpenCL/m00130_a3-optimized.cl index 306a6d659..86bc281c5 100644 --- a/OpenCL/m00130_a3-optimized.cl +++ b/OpenCL/m00130_a3-optimized.cl @@ -32,22 +32,22 @@ DECLSPEC void m00130m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -68,7 +68,7 @@ DECLSPEC void m00130m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m00130m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -402,10 +402,10 @@ DECLSPEC void m00130s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -420,7 +420,7 @@ DECLSPEC void m00130s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -578,7 +578,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -605,7 +605,7 @@ KERNEL_FQ void m00130_m04 (KERN_ATTR_VECTOR ()) * main */ - m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00130_m08 (KERN_ATTR_VECTOR ()) @@ -616,7 +616,7 @@ KERNEL_FQ void m00130_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -643,7 +643,7 @@ KERNEL_FQ void m00130_m08 (KERN_ATTR_VECTOR ()) * main */ - m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00130_m16 (KERN_ATTR_VECTOR ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m00130_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -681,7 +681,7 @@ KERNEL_FQ void m00130_m16 (KERN_ATTR_VECTOR ()) * main */ - m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00130_s04 (KERN_ATTR_VECTOR ()) @@ -692,7 +692,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -719,7 +719,7 @@ KERNEL_FQ void m00130_s04 (KERN_ATTR_VECTOR ()) * main */ - m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00130_s08 (KERN_ATTR_VECTOR ()) @@ -730,7 +730,7 @@ KERNEL_FQ void m00130_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -757,7 +757,7 @@ KERNEL_FQ void m00130_s08 (KERN_ATTR_VECTOR ()) * main */ - m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00130_s16 (KERN_ATTR_VECTOR ()) @@ -768,7 +768,7 @@ KERNEL_FQ void m00130_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -795,5 +795,5 @@ KERNEL_FQ void m00130_s16 (KERN_ATTR_VECTOR ()) * main */ - m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00130_a3-pure.cl b/OpenCL/m00130_a3-pure.cl index 50309d176..94824d3a2 100644 --- a/OpenCL/m00130_a3-pure.cl +++ b/OpenCL/m00130_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m00130_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m00130_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00140_a0-optimized.cl b/OpenCL/m00140_a0-optimized.cl index 5d49d1f0e..c9d70c648 100644 --- a/OpenCL/m00140_a0-optimized.cl +++ b/OpenCL/m00140_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -268,7 +268,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -293,24 +293,24 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -318,10 +318,10 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -334,7 +334,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00140_a0-pure.cl b/OpenCL/m00140_a0-pure.cl index 347cbae16..3075238c6 100644 --- a/OpenCL/m00140_a0-pure.cl +++ b/OpenCL/m00140_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00140_a1-optimized.cl b/OpenCL/m00140_a1-optimized.cl index 7274a6550..cfe2d491d 100644 --- a/OpenCL/m00140_a1-optimized.cl +++ b/OpenCL/m00140_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -324,7 +324,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -349,24 +349,24 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -374,10 +374,10 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -390,7 +390,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -428,7 +428,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00140_a1-pure.cl b/OpenCL/m00140_a1-pure.cl index c9ad3a97c..1ac340bf5 100644 --- a/OpenCL/m00140_a1-pure.cl +++ b/OpenCL/m00140_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m00140_a3-optimized.cl b/OpenCL/m00140_a3-optimized.cl index 12504e385..56d2c1dba 100644 --- a/OpenCL/m00140_a3-optimized.cl +++ b/OpenCL/m00140_a3-optimized.cl @@ -32,24 +32,24 @@ DECLSPEC void m00140m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -59,7 +59,7 @@ DECLSPEC void m00140m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -248,10 +248,10 @@ DECLSPEC void m00140s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -269,24 +269,24 @@ DECLSPEC void m00140s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -296,7 +296,7 @@ DECLSPEC void m00140s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -481,7 +481,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -517,7 +517,7 @@ KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) * main */ - m00140m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00140m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00140_m08 (KERN_ATTR_BASIC ()) @@ -528,7 +528,7 @@ KERNEL_FQ void m00140_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -564,7 +564,7 @@ KERNEL_FQ void m00140_m08 (KERN_ATTR_BASIC ()) * main */ - m00140m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00140m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00140_m16 (KERN_ATTR_BASIC ()) @@ -575,7 +575,7 @@ KERNEL_FQ void m00140_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -611,7 +611,7 @@ KERNEL_FQ void m00140_m16 (KERN_ATTR_BASIC ()) * main */ - m00140m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00140m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) @@ -622,7 +622,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -658,7 +658,7 @@ KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) * main */ - m00140s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00140s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00140_s08 (KERN_ATTR_BASIC ()) @@ -669,7 +669,7 @@ KERNEL_FQ void m00140_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -705,7 +705,7 @@ KERNEL_FQ void m00140_s08 (KERN_ATTR_BASIC ()) * main */ - m00140s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00140s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00140_s16 (KERN_ATTR_BASIC ()) @@ -716,7 +716,7 @@ KERNEL_FQ void m00140_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -752,5 +752,5 @@ KERNEL_FQ void m00140_s16 (KERN_ATTR_BASIC ()) * main */ - m00140s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00140s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00140_a3-pure.cl b/OpenCL/m00140_a3-pure.cl index 2326cf63f..8d914b465 100644 --- a/OpenCL/m00140_a3-pure.cl +++ b/OpenCL/m00140_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m00140_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m00140_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00150_a0-optimized.cl b/OpenCL/m00150_a0-optimized.cl index 9c740f2d6..64bc31d4f 100644 --- a/OpenCL/m00150_a0-optimized.cl +++ b/OpenCL/m00150_a0-optimized.cl @@ -119,7 +119,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -144,30 +144,30 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -241,7 +241,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -266,24 +266,24 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -291,17 +291,17 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00150_a0-pure.cl b/OpenCL/m00150_a0-pure.cl index cc7286790..3691e8c58 100644 --- a/OpenCL/m00150_a0-pure.cl +++ b/OpenCL/m00150_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -78,7 +78,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -98,20 +98,20 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00150_a1-optimized.cl b/OpenCL/m00150_a1-optimized.cl index 3563810d2..aa5dbbfa5 100644 --- a/OpenCL/m00150_a1-optimized.cl +++ b/OpenCL/m00150_a1-optimized.cl @@ -117,7 +117,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -142,30 +142,30 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -203,7 +203,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -307,7 +307,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -332,24 +332,24 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -357,17 +357,17 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -405,7 +405,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00150_a1-pure.cl b/OpenCL/m00150_a1-pure.cl index e73df686c..d16ed73a2 100644 --- a/OpenCL/m00150_a1-pure.cl +++ b/OpenCL/m00150_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -101,7 +101,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -128,20 +128,20 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m00150_a3-optimized.cl b/OpenCL/m00150_a3-optimized.cl index 136f5bf9b..cea019f3a 100644 --- a/OpenCL/m00150_a3-optimized.cl +++ b/OpenCL/m00150_a3-optimized.cl @@ -121,24 +121,24 @@ DECLSPEC void m00150m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -146,7 +146,7 @@ DECLSPEC void m00150m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -226,24 +226,24 @@ DECLSPEC void m00150s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -251,10 +251,10 @@ DECLSPEC void m00150s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -263,7 +263,7 @@ DECLSPEC void m00150s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -333,7 +333,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -369,7 +369,7 @@ KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) * main */ - m00150m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00150m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00150_m08 (KERN_ATTR_BASIC ()) @@ -380,7 +380,7 @@ KERNEL_FQ void m00150_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -416,7 +416,7 @@ KERNEL_FQ void m00150_m08 (KERN_ATTR_BASIC ()) * main */ - m00150m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00150m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00150_m16 (KERN_ATTR_BASIC ()) @@ -427,7 +427,7 @@ KERNEL_FQ void m00150_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -463,7 +463,7 @@ KERNEL_FQ void m00150_m16 (KERN_ATTR_BASIC ()) * main */ - m00150m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00150m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) @@ -474,7 +474,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -510,7 +510,7 @@ KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) * main */ - m00150s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00150s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00150_s08 (KERN_ATTR_BASIC ()) @@ -521,7 +521,7 @@ KERNEL_FQ void m00150_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -557,7 +557,7 @@ KERNEL_FQ void m00150_s08 (KERN_ATTR_BASIC ()) * main */ - m00150s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00150s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00150_s16 (KERN_ATTR_BASIC ()) @@ -568,7 +568,7 @@ KERNEL_FQ void m00150_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -604,5 +604,5 @@ KERNEL_FQ void m00150_s16 (KERN_ATTR_BASIC ()) * main */ - m00150s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00150s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00150_a3-pure.cl b/OpenCL/m00150_a3-pure.cl index 90d225dfd..a641f4d96 100644 --- a/OpenCL/m00150_a3-pure.cl +++ b/OpenCL/m00150_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m00150_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -87,7 +87,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -114,13 +114,13 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -129,7 +129,7 @@ KERNEL_FQ void m00150_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl index 7bf3e3efd..99567a048 100644 --- a/OpenCL/m00160_a0-optimized.cl +++ b/OpenCL/m00160_a0-optimized.cl @@ -119,7 +119,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -144,22 +144,22 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -196,7 +196,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -254,7 +254,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -279,22 +279,22 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -333,17 +333,17 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00160_a0-pure.cl b/OpenCL/m00160_a0-pure.cl index 6c35a8e73..709c1c15a 100644 --- a/OpenCL/m00160_a0-pure.cl +++ b/OpenCL/m00160_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_hmac_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,13 +100,13 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_hmac_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00160_a1-optimized.cl b/OpenCL/m00160_a1-optimized.cl index 7c12c1ce6..ec3857301 100644 --- a/OpenCL/m00160_a1-optimized.cl +++ b/OpenCL/m00160_a1-optimized.cl @@ -117,7 +117,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -142,22 +142,22 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -194,7 +194,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -232,7 +232,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -312,7 +312,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -337,22 +337,22 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -391,17 +391,17 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -439,7 +439,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00160_a1-pure.cl b/OpenCL/m00160_a1-pure.cl index eb0bd9ba5..b39a59a0a 100644 --- a/OpenCL/m00160_a1-pure.cl +++ b/OpenCL/m00160_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_hmac_ctx_t ctx0; @@ -55,7 +55,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -103,7 +103,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -111,10 +111,10 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -130,13 +130,13 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_hmac_ctx_t ctx0; @@ -147,7 +147,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m00160_a3-optimized.cl b/OpenCL/m00160_a3-optimized.cl index 743a2bda8..b12c7b323 100644 --- a/OpenCL/m00160_a3-optimized.cl +++ b/OpenCL/m00160_a3-optimized.cl @@ -121,22 +121,22 @@ DECLSPEC void m00160m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -175,7 +175,7 @@ DECLSPEC void m00160m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -224,22 +224,22 @@ DECLSPEC void m00160s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -278,10 +278,10 @@ DECLSPEC void m00160s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -290,7 +290,7 @@ DECLSPEC void m00160s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -329,7 +329,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -365,7 +365,7 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) * main */ - m00160m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00160m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00160_m08 (KERN_ATTR_BASIC ()) @@ -376,7 +376,7 @@ KERNEL_FQ void m00160_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -412,7 +412,7 @@ KERNEL_FQ void m00160_m08 (KERN_ATTR_BASIC ()) * main */ - m00160m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00160m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00160_m16 (KERN_ATTR_BASIC ()) @@ -423,7 +423,7 @@ KERNEL_FQ void m00160_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -459,7 +459,7 @@ KERNEL_FQ void m00160_m16 (KERN_ATTR_BASIC ()) * main */ - m00160m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00160m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) @@ -470,7 +470,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -506,7 +506,7 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) * main */ - m00160s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00160s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00160_s08 (KERN_ATTR_BASIC ()) @@ -517,7 +517,7 @@ KERNEL_FQ void m00160_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -553,7 +553,7 @@ KERNEL_FQ void m00160_s08 (KERN_ATTR_BASIC ()) * main */ - m00160s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00160s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00160_s16 (KERN_ATTR_BASIC ()) @@ -564,7 +564,7 @@ KERNEL_FQ void m00160_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -600,5 +600,5 @@ KERNEL_FQ void m00160_s16 (KERN_ATTR_BASIC ()) * main */ - m00160s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00160s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00160_a3-pure.cl b/OpenCL/m00160_a3-pure.cl index 7d28e69ce..4259c6c7d 100644 --- a/OpenCL/m00160_a3-pure.cl +++ b/OpenCL/m00160_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_hmac_ctx_vector_t ctx0; @@ -57,7 +57,7 @@ KERNEL_FQ void m00160_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_hmac_ctx_vector_t ctx0; @@ -135,7 +135,7 @@ KERNEL_FQ void m00160_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00170_a0-optimized.cl b/OpenCL/m00170_a0-optimized.cl index 451d34fe8..25daed69b 100644 --- a/OpenCL/m00170_a0-optimized.cl +++ b/OpenCL/m00170_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -215,7 +215,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -237,10 +237,10 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -253,7 +253,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00170_a0-pure.cl b/OpenCL/m00170_a0-pure.cl index 62a0b8d0c..53f03d72b 100644 --- a/OpenCL/m00170_a0-pure.cl +++ b/OpenCL/m00170_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00170_a1-optimized.cl b/OpenCL/m00170_a1-optimized.cl index 1656a3aaf..0a9f101fc 100644 --- a/OpenCL/m00170_a1-optimized.cl +++ b/OpenCL/m00170_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -271,7 +271,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -293,10 +293,10 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -309,7 +309,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -347,7 +347,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00170_a1-pure.cl b/OpenCL/m00170_a1-pure.cl index d907f3513..6b72e4bb4 100644 --- a/OpenCL/m00170_a1-pure.cl +++ b/OpenCL/m00170_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m00170_a3-optimized.cl b/OpenCL/m00170_a3-optimized.cl index c29b27025..7ab61fccf 100644 --- a/OpenCL/m00170_a3-optimized.cl +++ b/OpenCL/m00170_a3-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void m00170m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -351,10 +351,10 @@ DECLSPEC void m00170s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -369,7 +369,7 @@ DECLSPEC void m00170s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -527,7 +527,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -554,7 +554,7 @@ KERNEL_FQ void m00170_m04 (KERN_ATTR_VECTOR ()) * main */ - m00170m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00170m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00170_m08 (KERN_ATTR_VECTOR ()) @@ -565,7 +565,7 @@ KERNEL_FQ void m00170_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -592,7 +592,7 @@ KERNEL_FQ void m00170_m08 (KERN_ATTR_VECTOR ()) * main */ - m00170m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00170m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00170_m16 (KERN_ATTR_VECTOR ()) @@ -603,7 +603,7 @@ KERNEL_FQ void m00170_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -630,7 +630,7 @@ KERNEL_FQ void m00170_m16 (KERN_ATTR_VECTOR ()) * main */ - m00170m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00170m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00170_s04 (KERN_ATTR_VECTOR ()) @@ -641,7 +641,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -668,7 +668,7 @@ KERNEL_FQ void m00170_s04 (KERN_ATTR_VECTOR ()) * main */ - m00170s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00170s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00170_s08 (KERN_ATTR_VECTOR ()) @@ -679,7 +679,7 @@ KERNEL_FQ void m00170_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -706,7 +706,7 @@ KERNEL_FQ void m00170_s08 (KERN_ATTR_VECTOR ()) * main */ - m00170s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00170s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00170_s16 (KERN_ATTR_VECTOR ()) @@ -717,7 +717,7 @@ KERNEL_FQ void m00170_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -744,5 +744,5 @@ KERNEL_FQ void m00170_s16 (KERN_ATTR_VECTOR ()) * main */ - m00170s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00170s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00170_a3-pure.cl b/OpenCL/m00170_a3-pure.cl index 635e63821..c31d2d3ef 100644 --- a/OpenCL/m00170_a3-pure.cl +++ b/OpenCL/m00170_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m00170_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m00170_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00200_a0-optimized.cl b/OpenCL/m00200_a0-optimized.cl index b5f930466..1da035a0a 100644 --- a/OpenCL/m00200_a0-optimized.cl +++ b/OpenCL/m00200_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -156,7 +156,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -178,8 +178,8 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -188,7 +188,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00200_a1-optimized.cl b/OpenCL/m00200_a1-optimized.cl index 14ea330df..3cc52a5d2 100644 --- a/OpenCL/m00200_a1-optimized.cl +++ b/OpenCL/m00200_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -218,7 +218,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -240,8 +240,8 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -250,7 +250,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -288,7 +288,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00200_a3-optimized.cl b/OpenCL/m00200_a3-optimized.cl index d35c79372..826be0140 100644 --- a/OpenCL/m00200_a3-optimized.cl +++ b/OpenCL/m00200_a3-optimized.cl @@ -22,7 +22,7 @@ #define CODE_PRE \ { \ - 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 = words_buf_r[il_pos / VECT_SIZE]; \ \ @@ -105,8 +105,8 @@ DECLSPEC void m00200m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -233,8 +233,8 @@ DECLSPEC void m00200s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -354,7 +354,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -381,7 +381,7 @@ KERNEL_FQ void m00200_m04 (KERN_ATTR_VECTOR ()) * main */ - m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00200_m08 (KERN_ATTR_VECTOR ()) @@ -392,7 +392,7 @@ KERNEL_FQ void m00200_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -419,7 +419,7 @@ KERNEL_FQ void m00200_m08 (KERN_ATTR_VECTOR ()) * main */ - m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00200_m16 (KERN_ATTR_VECTOR ()) @@ -430,7 +430,7 @@ KERNEL_FQ void m00200_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -457,7 +457,7 @@ KERNEL_FQ void m00200_m16 (KERN_ATTR_VECTOR ()) * main */ - m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00200_s04 (KERN_ATTR_VECTOR ()) @@ -468,7 +468,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -495,7 +495,7 @@ KERNEL_FQ void m00200_s04 (KERN_ATTR_VECTOR ()) * main */ - m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00200_s08 (KERN_ATTR_VECTOR ()) @@ -506,7 +506,7 @@ KERNEL_FQ void m00200_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -533,7 +533,7 @@ KERNEL_FQ void m00200_s08 (KERN_ATTR_VECTOR ()) * main */ - m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00200_s16 (KERN_ATTR_VECTOR ()) @@ -544,7 +544,7 @@ KERNEL_FQ void m00200_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -571,5 +571,5 @@ KERNEL_FQ void m00200_s16 (KERN_ATTR_VECTOR ()) * main */ - m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00300_a0-optimized.cl b/OpenCL/m00300_a0-optimized.cl index 375999c9e..26e43cbf2 100644 --- a/OpenCL/m00300_a0-optimized.cl +++ b/OpenCL/m00300_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -335,7 +335,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -357,10 +357,10 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -373,7 +373,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00300_a0-pure.cl b/OpenCL/m00300_a0-pure.cl index bc15934b4..10cceac44 100644 --- a/OpenCL/m00300_a0-pure.cl +++ b/OpenCL/m00300_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -92,7 +92,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -100,10 +100,10 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,7 +116,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00300_a1-optimized.cl b/OpenCL/m00300_a1-optimized.cl index 28f09a6c0..cf40a028a 100644 --- a/OpenCL/m00300_a1-optimized.cl +++ b/OpenCL/m00300_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -391,7 +391,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -413,10 +413,10 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -429,7 +429,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -467,7 +467,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00300_a1-pure.cl b/OpenCL/m00300_a1-pure.cl index 544c10adf..119ed3af1 100644 --- a/OpenCL/m00300_a1-pure.cl +++ b/OpenCL/m00300_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; @@ -88,7 +88,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -96,10 +96,10 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,7 +116,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m00300_a3-optimized.cl b/OpenCL/m00300_a3-optimized.cl index 9e94b7159..1551e9828 100644 --- a/OpenCL/m00300_a3-optimized.cl +++ b/OpenCL/m00300_a3-optimized.cl @@ -110,7 +110,7 @@ DECLSPEC void m00300m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -479,10 +479,10 @@ DECLSPEC void m00300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -497,7 +497,7 @@ DECLSPEC void m00300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -781,7 +781,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -808,7 +808,7 @@ KERNEL_FQ void m00300_m04 (KERN_ATTR_VECTOR ()) * main */ - m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00300_m08 (KERN_ATTR_VECTOR ()) @@ -819,7 +819,7 @@ KERNEL_FQ void m00300_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -846,7 +846,7 @@ KERNEL_FQ void m00300_m08 (KERN_ATTR_VECTOR ()) * main */ - m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00300_m16 (KERN_ATTR_VECTOR ()) @@ -857,7 +857,7 @@ KERNEL_FQ void m00300_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -884,7 +884,7 @@ KERNEL_FQ void m00300_m16 (KERN_ATTR_VECTOR ()) * main */ - m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00300_s04 (KERN_ATTR_VECTOR ()) @@ -895,7 +895,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -922,7 +922,7 @@ KERNEL_FQ void m00300_s04 (KERN_ATTR_VECTOR ()) * main */ - m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00300_s08 (KERN_ATTR_VECTOR ()) @@ -933,7 +933,7 @@ KERNEL_FQ void m00300_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -960,7 +960,7 @@ KERNEL_FQ void m00300_s08 (KERN_ATTR_VECTOR ()) * main */ - m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00300_s16 (KERN_ATTR_VECTOR ()) @@ -971,7 +971,7 @@ KERNEL_FQ void m00300_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -998,5 +998,5 @@ KERNEL_FQ void m00300_s16 (KERN_ATTR_VECTOR ()) * main */ - m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00300_a3-pure.cl b/OpenCL/m00300_a3-pure.cl index 4e953d04b..ff3f0e438 100644 --- a/OpenCL/m00300_a3-pure.cl +++ b/OpenCL/m00300_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m00300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -101,7 +101,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -134,7 +134,7 @@ KERNEL_FQ void m00300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00400-optimized.cl b/OpenCL/m00400-optimized.cl index cfaba4c02..489f4791f 100644 --- a/OpenCL/m00400-optimized.cl +++ b/OpenCL/m00400-optimized.cl @@ -31,7 +31,7 @@ KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -62,8 +62,8 @@ KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; /** * init @@ -128,7 +128,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x w0[4]; u32x w1[4]; @@ -190,7 +190,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) * init */ - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { block0[0] = digest[0]; block0[1] = digest[1]; @@ -220,7 +220,7 @@ KERNEL_FQ void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest diff --git a/OpenCL/m00400-pure.cl b/OpenCL/m00400-pure.cl index 311b811ef..79bbebaf6 100644 --- a/OpenCL/m00400-pure.cl +++ b/OpenCL/m00400-pure.cl @@ -31,7 +31,7 @@ KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -41,7 +41,7 @@ KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) md5_init (&md5_ctx); - md5_update_global (&md5_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&md5_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global (&md5_ctx, pws[gid].i, pws[gid].pw_len); @@ -68,7 +68,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -116,7 +116,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) if ((16 + pw_len + 1) >= 56) { - for (u32 i = 1; i < loop_cnt; i++) + for (u32 i = 1; i < LOOP_CNT; i++) { md5_init (&md5_ctx); @@ -139,7 +139,7 @@ KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) } else { - for (u32 i = 1; i < loop_cnt; i++) + for (u32 i = 1; i < LOOP_CNT; i++) { md5_ctx.w0[0] = digest[0]; md5_ctx.w0[1] = digest[1]; @@ -170,7 +170,7 @@ KERNEL_FQ void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl index 38a361b96..c965512b0 100644 --- a/OpenCL/m00500-optimized.cl +++ b/OpenCL/m00500-optimized.cl @@ -667,7 +667,7 @@ KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -684,10 +684,10 @@ KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * init @@ -830,7 +830,7 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -856,10 +856,10 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -908,7 +908,7 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) block3[2] = 0; block3[3] = 0; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { block1[0] = 0; block1[1] = 0; @@ -1018,7 +1018,7 @@ KERNEL_FQ void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m00500-pure.cl b/OpenCL/m00500-pure.cl index cad75f6cf..e8b961809 100644 --- a/OpenCL/m00500-pure.cl +++ b/OpenCL/m00500-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -47,13 +47,13 @@ KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -138,7 +138,7 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -153,13 +153,13 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -177,7 +177,7 @@ KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) * loop */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { md5_ctx_t md5_ctx; @@ -233,7 +233,7 @@ KERNEL_FQ void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m00600_a0-optimized.cl b/OpenCL/m00600_a0-optimized.cl index 882ee7f6a..824641acc 100644 --- a/OpenCL/m00600_a0-optimized.cl +++ b/OpenCL/m00600_a0-optimized.cl @@ -24,7 +24,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -44,7 +44,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -110,7 +110,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -132,17 +132,17 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00600_a0-pure.cl b/OpenCL/m00600_a0-pure.cl index fc86ffb90..34c37bb3d 100644 --- a/OpenCL/m00600_a0-pure.cl +++ b/OpenCL/m00600_a0-pure.cl @@ -24,7 +24,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -36,7 +36,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -65,7 +65,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00600_a1-optimized.cl b/OpenCL/m00600_a1-optimized.cl index 4603ef2f7..75184cfae 100644 --- a/OpenCL/m00600_a1-optimized.cl +++ b/OpenCL/m00600_a1-optimized.cl @@ -22,7 +22,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -42,7 +42,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -80,7 +80,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -168,7 +168,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -190,17 +190,17 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -238,7 +238,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00600_a1-pure.cl b/OpenCL/m00600_a1-pure.cl index d6bbb311e..ae84ed2b7 100644 --- a/OpenCL/m00600_a1-pure.cl +++ b/OpenCL/m00600_a1-pure.cl @@ -22,7 +22,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,7 +38,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { blake2b_ctx_t ctx = ctx0; @@ -63,7 +63,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -71,10 +71,10 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -91,7 +91,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { blake2b_ctx_t ctx = ctx0; diff --git a/OpenCL/m00600_a3-optimized.cl b/OpenCL/m00600_a3-optimized.cl index be44646ef..ca1debe58 100644 --- a/OpenCL/m00600_a3-optimized.cl +++ b/OpenCL/m00600_a3-optimized.cl @@ -28,7 +28,7 @@ DECLSPEC void m00600m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; const u32x w0x = w0l | w0r; @@ -110,10 +110,10 @@ DECLSPEC void m00600s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -122,7 +122,7 @@ DECLSPEC void m00600s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; const u32x w0x = w0l | w0r; @@ -198,7 +198,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -225,7 +225,7 @@ KERNEL_FQ void m00600_m04 (KERN_ATTR_VECTOR ()) * main */ - m00600m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00600m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00600_m08 (KERN_ATTR_VECTOR ()) @@ -236,7 +236,7 @@ KERNEL_FQ void m00600_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -263,7 +263,7 @@ KERNEL_FQ void m00600_m08 (KERN_ATTR_VECTOR ()) * main */ - m00600m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00600m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00600_m16 (KERN_ATTR_VECTOR ()) @@ -274,7 +274,7 @@ KERNEL_FQ void m00600_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -301,7 +301,7 @@ KERNEL_FQ void m00600_m16 (KERN_ATTR_VECTOR ()) * main */ - m00600m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00600m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00600_s04 (KERN_ATTR_VECTOR ()) @@ -312,7 +312,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -339,7 +339,7 @@ KERNEL_FQ void m00600_s04 (KERN_ATTR_VECTOR ()) * main */ - m00600s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00600s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00600_s08 (KERN_ATTR_VECTOR ()) @@ -350,7 +350,7 @@ KERNEL_FQ void m00600_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -377,7 +377,7 @@ KERNEL_FQ void m00600_s08 (KERN_ATTR_VECTOR ()) * main */ - m00600s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00600s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00600_s16 (KERN_ATTR_VECTOR ()) @@ -388,7 +388,7 @@ KERNEL_FQ void m00600_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -415,5 +415,5 @@ KERNEL_FQ void m00600_s16 (KERN_ATTR_VECTOR ()) * main */ - m00600s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00600s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00600_a3-pure.cl b/OpenCL/m00600_a3-pure.cl index 610442184..98c7ccae6 100644 --- a/OpenCL/m00600_a3-pure.cl +++ b/OpenCL/m00600_a3-pure.cl @@ -22,7 +22,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -43,7 +43,7 @@ KERNEL_FQ void m00600_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -74,7 +74,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -82,10 +82,10 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -107,7 +107,7 @@ KERNEL_FQ void m00600_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m00900_a0-optimized.cl b/OpenCL/m00900_a0-optimized.cl index 25ee08aa2..01596b38c 100644 --- a/OpenCL/m00900_a0-optimized.cl +++ b/OpenCL/m00900_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -146,7 +146,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -168,17 +168,17 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m00900_a0-pure.cl b/OpenCL/m00900_a0-pure.cl index 1578a97c3..dd154dc1c 100644 --- a/OpenCL/m00900_a0-pure.cl +++ b/OpenCL/m00900_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m00900_a1-optimized.cl b/OpenCL/m00900_a1-optimized.cl index 83b55cc12..1539f23bd 100644 --- a/OpenCL/m00900_a1-optimized.cl +++ b/OpenCL/m00900_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -203,7 +203,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -225,17 +225,17 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -273,7 +273,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m00900_a1-pure.cl b/OpenCL/m00900_a1-pure.cl index 1329b3d13..409a0b388 100644 --- a/OpenCL/m00900_a1-pure.cl +++ b/OpenCL/m00900_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; diff --git a/OpenCL/m00900_a3-optimized.cl b/OpenCL/m00900_a3-optimized.cl index 0b28df133..d67d84152 100644 --- a/OpenCL/m00900_a3-optimized.cl +++ b/OpenCL/m00900_a3-optimized.cl @@ -99,7 +99,7 @@ DECLSPEC void m00900m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -235,20 +235,20 @@ DECLSPEC void m00900s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD4_STEP_REV (MD4_H_S, b_rev, c_rev, d_rev, a_rev, w[15], MD4C02, MD4S23); MD4_STEP_REV (MD4_H_S, c_rev, d_rev, a_rev, b_rev, w[ 7], MD4C02, MD4S22); @@ -279,7 +279,7 @@ DECLSPEC void m00900s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -361,7 +361,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -388,7 +388,7 @@ KERNEL_FQ void m00900_m04 (KERN_ATTR_VECTOR ()) * main */ - m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00900_m08 (KERN_ATTR_VECTOR ()) @@ -399,7 +399,7 @@ KERNEL_FQ void m00900_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -426,7 +426,7 @@ KERNEL_FQ void m00900_m08 (KERN_ATTR_VECTOR ()) * main */ - m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00900_m16 (KERN_ATTR_VECTOR ()) @@ -437,7 +437,7 @@ KERNEL_FQ void m00900_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -464,7 +464,7 @@ KERNEL_FQ void m00900_m16 (KERN_ATTR_VECTOR ()) * main */ - m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00900_s04 (KERN_ATTR_VECTOR ()) @@ -475,7 +475,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -502,7 +502,7 @@ KERNEL_FQ void m00900_s04 (KERN_ATTR_VECTOR ()) * main */ - m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00900_s08 (KERN_ATTR_VECTOR ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m00900_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -540,7 +540,7 @@ KERNEL_FQ void m00900_s08 (KERN_ATTR_VECTOR ()) * main */ - m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m00900_s16 (KERN_ATTR_VECTOR ()) @@ -551,7 +551,7 @@ KERNEL_FQ void m00900_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -578,5 +578,5 @@ KERNEL_FQ void m00900_s16 (KERN_ATTR_VECTOR ()) * main */ - m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m00900_a3-pure.cl b/OpenCL/m00900_a3-pure.cl index 441522c95..65c548692 100644 --- a/OpenCL/m00900_a3-pure.cl +++ b/OpenCL/m00900_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m00900_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m00900_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01000_a0-optimized.cl b/OpenCL/m01000_a0-optimized.cl index b9f6bb345..fb4ed9b72 100644 --- a/OpenCL/m01000_a0-optimized.cl +++ b/OpenCL/m01000_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -149,7 +149,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -171,17 +171,17 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01000_a0-pure.cl b/OpenCL/m01000_a0-pure.cl index 664d30c98..eac37f155 100644 --- a/OpenCL/m01000_a0-pure.cl +++ b/OpenCL/m01000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01000_a1-optimized.cl b/OpenCL/m01000_a1-optimized.cl index 68223fe9d..3747785e0 100644 --- a/OpenCL/m01000_a1-optimized.cl +++ b/OpenCL/m01000_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -209,7 +209,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -231,17 +231,17 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -279,7 +279,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01000_a1-pure.cl b/OpenCL/m01000_a1-pure.cl index 7850441f7..d50d7a502 100644 --- a/OpenCL/m01000_a1-pure.cl +++ b/OpenCL/m01000_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; diff --git a/OpenCL/m01000_a3-optimized.cl b/OpenCL/m01000_a3-optimized.cl index 2e6ce6117..53296fcea 100644 --- a/OpenCL/m01000_a3-optimized.cl +++ b/OpenCL/m01000_a3-optimized.cl @@ -99,7 +99,7 @@ DECLSPEC void m01000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -235,20 +235,20 @@ DECLSPEC void m01000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD4_STEP_REV (MD4_H_S, b_rev, c_rev, d_rev, a_rev, w[15], MD4C02, MD4S23); MD4_STEP_REV (MD4_H_S, c_rev, d_rev, a_rev, b_rev, w[ 7], MD4C02, MD4S22); @@ -279,7 +279,7 @@ DECLSPEC void m01000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -361,7 +361,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -388,7 +388,7 @@ KERNEL_FQ void m01000_m04 (KERN_ATTR_VECTOR ()) * main */ - m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01000_m08 (KERN_ATTR_VECTOR ()) @@ -399,7 +399,7 @@ KERNEL_FQ void m01000_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -426,7 +426,7 @@ KERNEL_FQ void m01000_m08 (KERN_ATTR_VECTOR ()) * main */ - m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01000_m16 (KERN_ATTR_VECTOR ()) @@ -437,7 +437,7 @@ KERNEL_FQ void m01000_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -464,7 +464,7 @@ KERNEL_FQ void m01000_m16 (KERN_ATTR_VECTOR ()) * main */ - m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01000_s04 (KERN_ATTR_VECTOR ()) @@ -475,7 +475,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -502,7 +502,7 @@ KERNEL_FQ void m01000_s04 (KERN_ATTR_VECTOR ()) * main */ - m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01000_s08 (KERN_ATTR_VECTOR ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m01000_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -540,7 +540,7 @@ KERNEL_FQ void m01000_s08 (KERN_ATTR_VECTOR ()) * main */ - m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01000_s16 (KERN_ATTR_VECTOR ()) @@ -551,7 +551,7 @@ KERNEL_FQ void m01000_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -578,5 +578,5 @@ KERNEL_FQ void m01000_s16 (KERN_ATTR_VECTOR ()) * main */ - m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01000_a3-pure.cl b/OpenCL/m01000_a3-pure.cl index bf04030f6..4ac216f4a 100644 --- a/OpenCL/m01000_a3-pure.cl +++ b/OpenCL/m01000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m01000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m01000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01100_a0-optimized.cl b/OpenCL/m01100_a0-optimized.cl index da35e1983..8368ba921 100644 --- a/OpenCL/m01100_a0-optimized.cl +++ b/OpenCL/m01100_a0-optimized.cl @@ -47,14 +47,14 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_RULES ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define salt_buf00 s_salt_buf[0].salt_buf[ 0] #define salt_buf01 s_salt_buf[0].salt_buf[ 1] @@ -72,7 +72,7 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -266,14 +266,14 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_RULES ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define salt_buf00 s_salt_buf[0].salt_buf[ 0] #define salt_buf01 s_salt_buf[0].salt_buf[ 1] @@ -293,17 +293,17 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01100_a0-pure.cl b/OpenCL/m01100_a0-pure.cl index 83d17603e..1a1fe96d8 100644 --- a/OpenCL/m01100_a0-pure.cl +++ b/OpenCL/m01100_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -93,7 +93,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -101,10 +101,10 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -113,20 +113,20 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01100_a1-optimized.cl b/OpenCL/m01100_a1-optimized.cl index 0f915b92f..1093e338b 100644 --- a/OpenCL/m01100_a1-optimized.cl +++ b/OpenCL/m01100_a1-optimized.cl @@ -45,14 +45,14 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_BASIC ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define salt_buf00 s_salt_buf[0].salt_buf[ 0] #define salt_buf01 s_salt_buf[0].salt_buf[ 1] @@ -70,7 +70,7 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -108,7 +108,7 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -326,14 +326,14 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_BASIC ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define salt_buf00 s_salt_buf[0].salt_buf[ 0] #define salt_buf01 s_salt_buf[0].salt_buf[ 1] @@ -353,17 +353,17 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -401,7 +401,7 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01100_a1-pure.cl b/OpenCL/m01100_a1-pure.cl index de4834a2d..a1b62ece6 100644 --- a/OpenCL/m01100_a1-pure.cl +++ b/OpenCL/m01100_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md4_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx1 = ctx0; @@ -89,7 +89,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,23 +97,23 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md4_ctx_t ctx0; @@ -126,7 +126,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m01100_a3-optimized.cl b/OpenCL/m01100_a3-optimized.cl index f32d54081..6c52735c1 100644 --- a/OpenCL/m01100_a3-optimized.cl +++ b/OpenCL/m01100_a3-optimized.cl @@ -100,7 +100,7 @@ DECLSPEC void m01100m (LOCAL_AS salt_t *s_salt_buf, u32 *w, const u32 pw_len, KE u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -335,10 +335,10 @@ DECLSPEC void m01100s (LOCAL_AS salt_t *s_salt_buf, u32 *w, const u32 pw_len, KE const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -347,7 +347,7 @@ DECLSPEC void m01100s (LOCAL_AS salt_t *s_salt_buf, u32 *w, const u32 pw_len, KE u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -537,20 +537,20 @@ KERNEL_FQ void m01100_m04 (KERN_ATTR_VECTOR ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01100_m08 (KERN_ATTR_VECTOR ()) @@ -591,20 +591,20 @@ KERNEL_FQ void m01100_m08 (KERN_ATTR_VECTOR ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01100_m16 (KERN_ATTR_VECTOR ()) @@ -645,20 +645,20 @@ KERNEL_FQ void m01100_m16 (KERN_ATTR_VECTOR ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01100_s04 (KERN_ATTR_VECTOR ()) @@ -699,20 +699,20 @@ KERNEL_FQ void m01100_s04 (KERN_ATTR_VECTOR ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01100_s08 (KERN_ATTR_VECTOR ()) @@ -753,20 +753,20 @@ KERNEL_FQ void m01100_s08 (KERN_ATTR_VECTOR ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01100_s16 (KERN_ATTR_VECTOR ()) @@ -807,18 +807,18 @@ KERNEL_FQ void m01100_s16 (KERN_ATTR_VECTOR ()) if (lid == 0) { - s_salt_buf[0] = salt_bufs[SALT_POS]; + s_salt_buf[0] = salt_bufs[SALT_POS_HOST]; s_salt_buf[0].salt_buf[10] = (16 + s_salt_buf[0].salt_len) * 8; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01100_a3-pure.cl b/OpenCL/m01100_a3-pure.cl index 9bd57619a..7834b5f05 100644 --- a/OpenCL/m01100_a3-pure.cl +++ b/OpenCL/m01100_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -102,7 +102,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -110,10 +110,10 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -129,13 +129,13 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -144,7 +144,7 @@ KERNEL_FQ void m01100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01300_a0-optimized.cl b/OpenCL/m01300_a0-optimized.cl index df965bfd0..2d095df11 100644 --- a/OpenCL/m01300_a0-optimized.cl +++ b/OpenCL/m01300_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -198,7 +198,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -220,23 +220,23 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; SHA224_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev); SHA224_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev); @@ -246,7 +246,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01300_a0-pure.cl b/OpenCL/m01300_a0-pure.cl index 1a88e6429..e3412d290 100644 --- a/OpenCL/m01300_a0-pure.cl +++ b/OpenCL/m01300_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01300_a1-optimized.cl b/OpenCL/m01300_a1-optimized.cl index 3405eaeba..055335aac 100644 --- a/OpenCL/m01300_a1-optimized.cl +++ b/OpenCL/m01300_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -254,7 +254,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -276,23 +276,23 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; SHA224_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev); SHA224_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev); @@ -302,7 +302,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -340,7 +340,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01300_a1-pure.cl b/OpenCL/m01300_a1-pure.cl index 421f39ce6..346b1b239 100644 --- a/OpenCL/m01300_a1-pure.cl +++ b/OpenCL/m01300_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha224_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha224_ctx_t ctx = ctx0; diff --git a/OpenCL/m01300_a3-optimized.cl b/OpenCL/m01300_a3-optimized.cl index 44e3ef88d..370ac60f5 100644 --- a/OpenCL/m01300_a3-optimized.cl +++ b/OpenCL/m01300_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m01300m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -161,23 +161,23 @@ DECLSPEC void m01300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; SHA224_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev); SHA224_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev); @@ -189,7 +189,7 @@ DECLSPEC void m01300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -304,7 +304,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -331,7 +331,7 @@ KERNEL_FQ void m01300_m04 (KERN_ATTR_VECTOR ()) * main */ - m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01300_m08 (KERN_ATTR_VECTOR ()) @@ -342,7 +342,7 @@ KERNEL_FQ void m01300_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -369,7 +369,7 @@ KERNEL_FQ void m01300_m08 (KERN_ATTR_VECTOR ()) * main */ - m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01300_m16 (KERN_ATTR_VECTOR ()) @@ -380,7 +380,7 @@ KERNEL_FQ void m01300_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -407,7 +407,7 @@ KERNEL_FQ void m01300_m16 (KERN_ATTR_VECTOR ()) * main */ - m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01300_s04 (KERN_ATTR_VECTOR ()) @@ -418,7 +418,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -445,7 +445,7 @@ KERNEL_FQ void m01300_s04 (KERN_ATTR_VECTOR ()) * main */ - m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01300_s08 (KERN_ATTR_VECTOR ()) @@ -456,7 +456,7 @@ KERNEL_FQ void m01300_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -483,7 +483,7 @@ KERNEL_FQ void m01300_s08 (KERN_ATTR_VECTOR ()) * main */ - m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01300_s16 (KERN_ATTR_VECTOR ()) @@ -494,7 +494,7 @@ KERNEL_FQ void m01300_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -521,5 +521,5 @@ KERNEL_FQ void m01300_s16 (KERN_ATTR_VECTOR ()) * main */ - m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01300_a3-pure.cl b/OpenCL/m01300_a3-pure.cl index e1e0392e3..4b9506c38 100644 --- a/OpenCL/m01300_a3-pure.cl +++ b/OpenCL/m01300_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m01300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m01300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01400_a0-optimized.cl b/OpenCL/m01400_a0-optimized.cl index 31c119910..1ed573954 100644 --- a/OpenCL/m01400_a0-optimized.cl +++ b/OpenCL/m01400_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -64,7 +64,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -199,7 +199,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -221,24 +221,24 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -249,7 +249,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01400_a0-pure.cl b/OpenCL/m01400_a0-pure.cl index cf704adf7..e7a2f89d4 100644 --- a/OpenCL/m01400_a0-pure.cl +++ b/OpenCL/m01400_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01400_a1-optimized.cl b/OpenCL/m01400_a1-optimized.cl index e90e1c462..2a8eda9df 100644 --- a/OpenCL/m01400_a1-optimized.cl +++ b/OpenCL/m01400_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -62,7 +62,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -100,7 +100,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -255,7 +255,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -277,24 +277,24 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -305,7 +305,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -343,7 +343,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01400_a1-pure.cl b/OpenCL/m01400_a1-pure.cl index 33927a266..30b058a99 100644 --- a/OpenCL/m01400_a1-pure.cl +++ b/OpenCL/m01400_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m01400_a3-optimized.cl b/OpenCL/m01400_a3-optimized.cl index a794b3a0d..bde611927 100644 --- a/OpenCL/m01400_a3-optimized.cl +++ b/OpenCL/m01400_a3-optimized.cl @@ -43,7 +43,7 @@ DECLSPEC void m01400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -162,24 +162,24 @@ DECLSPEC void m01400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -192,7 +192,7 @@ DECLSPEC void m01400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -307,7 +307,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -334,7 +334,7 @@ KERNEL_FQ void m01400_m04 (KERN_ATTR_VECTOR ()) * main */ - m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01400_m08 (KERN_ATTR_VECTOR ()) @@ -345,7 +345,7 @@ KERNEL_FQ void m01400_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -372,7 +372,7 @@ KERNEL_FQ void m01400_m08 (KERN_ATTR_VECTOR ()) * main */ - m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01400_m16 (KERN_ATTR_VECTOR ()) @@ -383,7 +383,7 @@ KERNEL_FQ void m01400_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -410,7 +410,7 @@ KERNEL_FQ void m01400_m16 (KERN_ATTR_VECTOR ()) * main */ - m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01400_s04 (KERN_ATTR_VECTOR ()) @@ -421,7 +421,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -448,7 +448,7 @@ KERNEL_FQ void m01400_s04 (KERN_ATTR_VECTOR ()) * main */ - m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01400_s08 (KERN_ATTR_VECTOR ()) @@ -459,7 +459,7 @@ KERNEL_FQ void m01400_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -486,7 +486,7 @@ KERNEL_FQ void m01400_s08 (KERN_ATTR_VECTOR ()) * main */ - m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01400_s16 (KERN_ATTR_VECTOR ()) @@ -497,7 +497,7 @@ KERNEL_FQ void m01400_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -524,5 +524,5 @@ KERNEL_FQ void m01400_s16 (KERN_ATTR_VECTOR ()) * main */ - m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01400_a3-pure.cl b/OpenCL/m01400_a3-pure.cl index a61b968ba..57dcd8e7e 100644 --- a/OpenCL/m01400_a3-pure.cl +++ b/OpenCL/m01400_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m01400_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m01400_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01410_a0-optimized.cl b/OpenCL/m01410_a0-optimized.cl index 2fd35a6e5..be9ac6d2f 100644 --- a/OpenCL/m01410_a0-optimized.cl +++ b/OpenCL/m01410_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,30 +69,30 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -272,7 +272,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -297,24 +297,24 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -322,24 +322,24 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -350,7 +350,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01410_a0-pure.cl b/OpenCL/m01410_a0-pure.cl index c06693df6..d0607e0ca 100644 --- a/OpenCL/m01410_a0-pure.cl +++ b/OpenCL/m01410_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01410_a1-optimized.cl b/OpenCL/m01410_a1-optimized.cl index 13dedd4e9..473be1e4f 100644 --- a/OpenCL/m01410_a1-optimized.cl +++ b/OpenCL/m01410_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -67,30 +67,30 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -128,7 +128,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -330,7 +330,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -355,24 +355,24 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -380,24 +380,24 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -408,7 +408,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -446,7 +446,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01410_a1-pure.cl b/OpenCL/m01410_a1-pure.cl index 6b3b46dc2..2c5442e52 100644 --- a/OpenCL/m01410_a1-pure.cl +++ b/OpenCL/m01410_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m01410_a3-optimized.cl b/OpenCL/m01410_a3-optimized.cl index 893b1b850..c6f49ee3f 100644 --- a/OpenCL/m01410_a3-optimized.cl +++ b/OpenCL/m01410_a3-optimized.cl @@ -46,22 +46,22 @@ DECLSPEC void m01410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -82,7 +82,7 @@ DECLSPEC void m01410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -94,7 +94,7 @@ DECLSPEC void m01410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -213,24 +213,24 @@ DECLSPEC void m01410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -243,7 +243,7 @@ DECLSPEC void m01410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -358,7 +358,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -385,7 +385,7 @@ KERNEL_FQ void m01410_m04 (KERN_ATTR_VECTOR ()) * main */ - m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01410_m08 (KERN_ATTR_VECTOR ()) @@ -396,7 +396,7 @@ KERNEL_FQ void m01410_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -423,7 +423,7 @@ KERNEL_FQ void m01410_m08 (KERN_ATTR_VECTOR ()) * main */ - m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01410_m16 (KERN_ATTR_VECTOR ()) @@ -434,7 +434,7 @@ KERNEL_FQ void m01410_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -461,7 +461,7 @@ KERNEL_FQ void m01410_m16 (KERN_ATTR_VECTOR ()) * main */ - m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01410_s04 (KERN_ATTR_VECTOR ()) @@ -472,7 +472,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -499,7 +499,7 @@ KERNEL_FQ void m01410_s04 (KERN_ATTR_VECTOR ()) * main */ - m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01410_s08 (KERN_ATTR_VECTOR ()) @@ -510,7 +510,7 @@ KERNEL_FQ void m01410_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -537,7 +537,7 @@ KERNEL_FQ void m01410_s08 (KERN_ATTR_VECTOR ()) * main */ - m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01410_s16 (KERN_ATTR_VECTOR ()) @@ -548,7 +548,7 @@ KERNEL_FQ void m01410_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -575,5 +575,5 @@ KERNEL_FQ void m01410_s16 (KERN_ATTR_VECTOR ()) * main */ - m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01410_a3-pure.cl b/OpenCL/m01410_a3-pure.cl index b5c77e460..1ab8486d7 100644 --- a/OpenCL/m01410_a3-pure.cl +++ b/OpenCL/m01410_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01410_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m01410_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01420_a0-optimized.cl b/OpenCL/m01420_a0-optimized.cl index 750cb6c05..8ec4b7f67 100644 --- a/OpenCL/m01420_a0-optimized.cl +++ b/OpenCL/m01420_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,30 +69,30 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -252,7 +252,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -277,24 +277,24 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -302,24 +302,24 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -330,7 +330,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01420_a0-pure.cl b/OpenCL/m01420_a0-pure.cl index 276393b0e..9578d8868 100644 --- a/OpenCL/m01420_a0-pure.cl +++ b/OpenCL/m01420_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_RULES ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_RULES ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01420_a1-optimized.cl b/OpenCL/m01420_a1-optimized.cl index 65c90e090..3c8131c1d 100644 --- a/OpenCL/m01420_a1-optimized.cl +++ b/OpenCL/m01420_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -67,30 +67,30 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -128,7 +128,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -308,7 +308,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -333,24 +333,24 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -358,24 +358,24 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -386,7 +386,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -424,7 +424,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01420_a1-pure.cl b/OpenCL/m01420_a1-pure.cl index aee8da2aa..e92c4fc11 100644 --- a/OpenCL/m01420_a1-pure.cl +++ b/OpenCL/m01420_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_BASIC ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_BASIC ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m01420_a3-optimized.cl b/OpenCL/m01420_a3-optimized.cl index fddff4a44..e0aac9346 100644 --- a/OpenCL/m01420_a3-optimized.cl +++ b/OpenCL/m01420_a3-optimized.cl @@ -46,24 +46,24 @@ DECLSPEC void m01420m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -73,7 +73,7 @@ DECLSPEC void m01420m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -237,24 +237,24 @@ DECLSPEC void m01420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -270,24 +270,24 @@ DECLSPEC void m01420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -297,7 +297,7 @@ DECLSPEC void m01420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -457,7 +457,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -493,7 +493,7 @@ KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) * main */ - m01420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01420_m08 (KERN_ATTR_BASIC ()) @@ -504,7 +504,7 @@ KERNEL_FQ void m01420_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -540,7 +540,7 @@ KERNEL_FQ void m01420_m08 (KERN_ATTR_BASIC ()) * main */ - m01420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01420_m16 (KERN_ATTR_BASIC ()) @@ -551,7 +551,7 @@ KERNEL_FQ void m01420_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -587,7 +587,7 @@ KERNEL_FQ void m01420_m16 (KERN_ATTR_BASIC ()) * main */ - m01420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) @@ -598,7 +598,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -634,7 +634,7 @@ KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) * main */ - m01420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01420_s08 (KERN_ATTR_BASIC ()) @@ -645,7 +645,7 @@ KERNEL_FQ void m01420_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -681,7 +681,7 @@ KERNEL_FQ void m01420_s08 (KERN_ATTR_BASIC ()) * main */ - m01420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01420_s16 (KERN_ATTR_BASIC ()) @@ -692,7 +692,7 @@ KERNEL_FQ void m01420_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -728,5 +728,5 @@ KERNEL_FQ void m01420_s16 (KERN_ATTR_BASIC ()) * main */ - m01420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01420_a3-pure.cl b/OpenCL/m01420_a3-pure.cl index 11dc947a2..0bf81bc0d 100644 --- a/OpenCL/m01420_a3-pure.cl +++ b/OpenCL/m01420_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_VECTOR ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m01420_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_VECTOR ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m01420_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01430_a0-optimized.cl b/OpenCL/m01430_a0-optimized.cl index bb0725ecd..d9b7e86d6 100644 --- a/OpenCL/m01430_a0-optimized.cl +++ b/OpenCL/m01430_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,30 +69,30 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -277,7 +277,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -302,24 +302,24 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -327,24 +327,24 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -355,7 +355,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01430_a0-pure.cl b/OpenCL/m01430_a0-pure.cl index 5b6521de7..108c6071e 100644 --- a/OpenCL/m01430_a0-pure.cl +++ b/OpenCL/m01430_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01430_a1-optimized.cl b/OpenCL/m01430_a1-optimized.cl index d9c6d02cc..d88ab462d 100644 --- a/OpenCL/m01430_a1-optimized.cl +++ b/OpenCL/m01430_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -67,30 +67,30 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -128,7 +128,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -335,7 +335,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -360,24 +360,24 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -385,24 +385,24 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -413,7 +413,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -451,7 +451,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01430_a1-pure.cl b/OpenCL/m01430_a1-pure.cl index c97c9d536..3c0f763ca 100644 --- a/OpenCL/m01430_a1-pure.cl +++ b/OpenCL/m01430_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m01430_a3-optimized.cl b/OpenCL/m01430_a3-optimized.cl index 9e9aee86b..c57918c0f 100644 --- a/OpenCL/m01430_a3-optimized.cl +++ b/OpenCL/m01430_a3-optimized.cl @@ -46,22 +46,22 @@ DECLSPEC void m01430m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -82,7 +82,7 @@ DECLSPEC void m01430m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -94,7 +94,7 @@ DECLSPEC void m01430m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -213,24 +213,24 @@ DECLSPEC void m01430s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -243,7 +243,7 @@ DECLSPEC void m01430s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -358,7 +358,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -385,7 +385,7 @@ KERNEL_FQ void m01430_m04 (KERN_ATTR_VECTOR ()) * main */ - m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01430_m08 (KERN_ATTR_VECTOR ()) @@ -396,7 +396,7 @@ KERNEL_FQ void m01430_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -423,7 +423,7 @@ KERNEL_FQ void m01430_m08 (KERN_ATTR_VECTOR ()) * main */ - m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01430_m16 (KERN_ATTR_VECTOR ()) @@ -434,7 +434,7 @@ KERNEL_FQ void m01430_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -461,7 +461,7 @@ KERNEL_FQ void m01430_m16 (KERN_ATTR_VECTOR ()) * main */ - m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01430_s04 (KERN_ATTR_VECTOR ()) @@ -472,7 +472,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -499,7 +499,7 @@ KERNEL_FQ void m01430_s04 (KERN_ATTR_VECTOR ()) * main */ - m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01430_s08 (KERN_ATTR_VECTOR ()) @@ -510,7 +510,7 @@ KERNEL_FQ void m01430_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -537,7 +537,7 @@ KERNEL_FQ void m01430_s08 (KERN_ATTR_VECTOR ()) * main */ - m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01430_s16 (KERN_ATTR_VECTOR ()) @@ -548,7 +548,7 @@ KERNEL_FQ void m01430_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -575,5 +575,5 @@ KERNEL_FQ void m01430_s16 (KERN_ATTR_VECTOR ()) * main */ - m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01430_a3-pure.cl b/OpenCL/m01430_a3-pure.cl index 6903d1fff..175543b45 100644 --- a/OpenCL/m01430_a3-pure.cl +++ b/OpenCL/m01430_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01430_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m01430_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01440_a0-optimized.cl b/OpenCL/m01440_a0-optimized.cl index 6c92d1a6a..cda478431 100644 --- a/OpenCL/m01440_a0-optimized.cl +++ b/OpenCL/m01440_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,30 +69,30 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -257,7 +257,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -282,24 +282,24 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -307,24 +307,24 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -335,7 +335,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01440_a0-pure.cl b/OpenCL/m01440_a0-pure.cl index 960a35424..ed995de09 100644 --- a/OpenCL/m01440_a0-pure.cl +++ b/OpenCL/m01440_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_RULES ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_RULES ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01440_a1-optimized.cl b/OpenCL/m01440_a1-optimized.cl index d753ca628..694191bb0 100644 --- a/OpenCL/m01440_a1-optimized.cl +++ b/OpenCL/m01440_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -67,30 +67,30 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -128,7 +128,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -313,7 +313,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -338,24 +338,24 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -363,24 +363,24 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -391,7 +391,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -429,7 +429,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01440_a1-pure.cl b/OpenCL/m01440_a1-pure.cl index d06fff1ca..3dd87e4ab 100644 --- a/OpenCL/m01440_a1-pure.cl +++ b/OpenCL/m01440_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_BASIC ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_BASIC ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m01440_a3-optimized.cl b/OpenCL/m01440_a3-optimized.cl index a41522434..5e39177f8 100644 --- a/OpenCL/m01440_a3-optimized.cl +++ b/OpenCL/m01440_a3-optimized.cl @@ -46,24 +46,24 @@ DECLSPEC void m01440m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -73,7 +73,7 @@ DECLSPEC void m01440m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -237,24 +237,24 @@ DECLSPEC void m01440s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -270,24 +270,24 @@ DECLSPEC void m01440s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -297,7 +297,7 @@ DECLSPEC void m01440s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -457,7 +457,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -493,7 +493,7 @@ KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) * main */ - m01440m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01440m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01440_m08 (KERN_ATTR_BASIC ()) @@ -504,7 +504,7 @@ KERNEL_FQ void m01440_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -540,7 +540,7 @@ KERNEL_FQ void m01440_m08 (KERN_ATTR_BASIC ()) * main */ - m01440m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01440m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01440_m16 (KERN_ATTR_BASIC ()) @@ -551,7 +551,7 @@ KERNEL_FQ void m01440_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -587,7 +587,7 @@ KERNEL_FQ void m01440_m16 (KERN_ATTR_BASIC ()) * main */ - m01440m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01440m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) @@ -598,7 +598,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -634,7 +634,7 @@ KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) * main */ - m01440s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01440s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01440_s08 (KERN_ATTR_BASIC ()) @@ -645,7 +645,7 @@ KERNEL_FQ void m01440_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -681,7 +681,7 @@ KERNEL_FQ void m01440_s08 (KERN_ATTR_BASIC ()) * main */ - m01440s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01440s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01440_s16 (KERN_ATTR_BASIC ()) @@ -692,7 +692,7 @@ KERNEL_FQ void m01440_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -728,5 +728,5 @@ KERNEL_FQ void m01440_s16 (KERN_ATTR_BASIC ()) * main */ - m01440s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01440s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01440_a3-pure.cl b/OpenCL/m01440_a3-pure.cl index a3740571c..5cba24633 100644 --- a/OpenCL/m01440_a3-pure.cl +++ b/OpenCL/m01440_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_VECTOR ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m01440_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_VECTOR ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m01440_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01450_a0-optimized.cl b/OpenCL/m01450_a0-optimized.cl index 51da3a874..af07dbee7 100644 --- a/OpenCL/m01450_a0-optimized.cl +++ b/OpenCL/m01450_a0-optimized.cl @@ -131,7 +131,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,30 +156,30 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -253,7 +253,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -278,24 +278,24 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -303,17 +303,17 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01450_a0-pure.cl b/OpenCL/m01450_a0-pure.cl index 6f04212c3..8cf8eff95 100644 --- a/OpenCL/m01450_a0-pure.cl +++ b/OpenCL/m01450_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -78,7 +78,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -98,20 +98,20 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01450_a1-optimized.cl b/OpenCL/m01450_a1-optimized.cl index 7b294d0d5..237f6226f 100644 --- a/OpenCL/m01450_a1-optimized.cl +++ b/OpenCL/m01450_a1-optimized.cl @@ -129,7 +129,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,30 +154,30 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -215,7 +215,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -319,7 +319,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -344,24 +344,24 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -369,17 +369,17 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -417,7 +417,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01450_a1-pure.cl b/OpenCL/m01450_a1-pure.cl index 6a49153c1..7a8c7face 100644 --- a/OpenCL/m01450_a1-pure.cl +++ b/OpenCL/m01450_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -101,7 +101,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -128,20 +128,20 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m01450_a3-optimized.cl b/OpenCL/m01450_a3-optimized.cl index 46231c2b1..2e93b881e 100644 --- a/OpenCL/m01450_a3-optimized.cl +++ b/OpenCL/m01450_a3-optimized.cl @@ -133,24 +133,24 @@ DECLSPEC void m01450m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -158,7 +158,7 @@ DECLSPEC void m01450m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -238,24 +238,24 @@ DECLSPEC void m01450s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -263,10 +263,10 @@ DECLSPEC void m01450s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -275,7 +275,7 @@ DECLSPEC void m01450s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -345,7 +345,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -381,7 +381,7 @@ KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) * main */ - m01450m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01450m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01450_m08 (KERN_ATTR_BASIC ()) @@ -392,7 +392,7 @@ KERNEL_FQ void m01450_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -428,7 +428,7 @@ KERNEL_FQ void m01450_m08 (KERN_ATTR_BASIC ()) * main */ - m01450m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01450m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01450_m16 (KERN_ATTR_BASIC ()) @@ -439,7 +439,7 @@ KERNEL_FQ void m01450_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -475,7 +475,7 @@ KERNEL_FQ void m01450_m16 (KERN_ATTR_BASIC ()) * main */ - m01450m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01450m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) @@ -486,7 +486,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -522,7 +522,7 @@ KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) * main */ - m01450s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01450s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01450_s08 (KERN_ATTR_BASIC ()) @@ -533,7 +533,7 @@ KERNEL_FQ void m01450_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -569,7 +569,7 @@ KERNEL_FQ void m01450_s08 (KERN_ATTR_BASIC ()) * main */ - m01450s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01450s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01450_s16 (KERN_ATTR_BASIC ()) @@ -580,7 +580,7 @@ KERNEL_FQ void m01450_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -616,5 +616,5 @@ KERNEL_FQ void m01450_s16 (KERN_ATTR_BASIC ()) * main */ - m01450s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01450s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01450_a3-pure.cl b/OpenCL/m01450_a3-pure.cl index c9186c8c7..55b3c638f 100644 --- a/OpenCL/m01450_a3-pure.cl +++ b/OpenCL/m01450_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01450_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -87,7 +87,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -114,13 +114,13 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -129,7 +129,7 @@ KERNEL_FQ void m01450_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl index 13a99bd38..d7dbcbd36 100644 --- a/OpenCL/m01460_a0-optimized.cl +++ b/OpenCL/m01460_a0-optimized.cl @@ -131,7 +131,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,22 +156,22 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -208,7 +208,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -266,7 +266,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -291,22 +291,22 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -345,17 +345,17 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01460_a0-pure.cl b/OpenCL/m01460_a0-pure.cl index 531b8670d..001924f71 100644 --- a/OpenCL/m01460_a0-pure.cl +++ b/OpenCL/m01460_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_hmac_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,13 +100,13 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_hmac_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01460_a1-optimized.cl b/OpenCL/m01460_a1-optimized.cl index c018d8844..1eb613562 100644 --- a/OpenCL/m01460_a1-optimized.cl +++ b/OpenCL/m01460_a1-optimized.cl @@ -129,7 +129,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,22 +154,22 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -206,7 +206,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -244,7 +244,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -324,7 +324,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -349,22 +349,22 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -403,17 +403,17 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -451,7 +451,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01460_a1-pure.cl b/OpenCL/m01460_a1-pure.cl index b0804ad36..76f47226c 100644 --- a/OpenCL/m01460_a1-pure.cl +++ b/OpenCL/m01460_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_hmac_ctx_t ctx0; @@ -55,7 +55,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -103,7 +103,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -111,10 +111,10 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -130,13 +130,13 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_hmac_ctx_t ctx0; @@ -147,7 +147,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m01460_a3-optimized.cl b/OpenCL/m01460_a3-optimized.cl index ef3ea4fd1..62c0cdeeb 100644 --- a/OpenCL/m01460_a3-optimized.cl +++ b/OpenCL/m01460_a3-optimized.cl @@ -133,22 +133,22 @@ DECLSPEC void m01460m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -187,7 +187,7 @@ DECLSPEC void m01460m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -236,22 +236,22 @@ DECLSPEC void m01460s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -290,10 +290,10 @@ DECLSPEC void m01460s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -302,7 +302,7 @@ DECLSPEC void m01460s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -341,7 +341,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -377,7 +377,7 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) * main */ - m01460m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01460m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01460_m08 (KERN_ATTR_BASIC ()) @@ -388,7 +388,7 @@ KERNEL_FQ void m01460_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -424,7 +424,7 @@ KERNEL_FQ void m01460_m08 (KERN_ATTR_BASIC ()) * main */ - m01460m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01460m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01460_m16 (KERN_ATTR_BASIC ()) @@ -435,7 +435,7 @@ KERNEL_FQ void m01460_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -471,7 +471,7 @@ KERNEL_FQ void m01460_m16 (KERN_ATTR_BASIC ()) * main */ - m01460m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01460m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) @@ -482,7 +482,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -518,7 +518,7 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) * main */ - m01460s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01460s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01460_s08 (KERN_ATTR_BASIC ()) @@ -529,7 +529,7 @@ KERNEL_FQ void m01460_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -565,7 +565,7 @@ KERNEL_FQ void m01460_s08 (KERN_ATTR_BASIC ()) * main */ - m01460s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01460s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01460_s16 (KERN_ATTR_BASIC ()) @@ -576,7 +576,7 @@ KERNEL_FQ void m01460_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -612,5 +612,5 @@ KERNEL_FQ void m01460_s16 (KERN_ATTR_BASIC ()) * main */ - m01460s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01460s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01460_a3-pure.cl b/OpenCL/m01460_a3-pure.cl index 1fe5b71fd..098f8e10b 100644 --- a/OpenCL/m01460_a3-pure.cl +++ b/OpenCL/m01460_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_hmac_ctx_vector_t ctx0; @@ -57,7 +57,7 @@ KERNEL_FQ void m01460_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_hmac_ctx_vector_t ctx0; @@ -135,7 +135,7 @@ KERNEL_FQ void m01460_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01470_a0-optimized.cl b/OpenCL/m01470_a0-optimized.cl index 11fc6343c..f0acf5cb2 100644 --- a/OpenCL/m01470_a0-optimized.cl +++ b/OpenCL/m01470_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -64,7 +64,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -204,7 +204,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -226,24 +226,24 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -254,7 +254,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01470_a0-pure.cl b/OpenCL/m01470_a0-pure.cl index aa1ac05d3..f7793c63f 100644 --- a/OpenCL/m01470_a0-pure.cl +++ b/OpenCL/m01470_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -41,7 +41,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -71,7 +71,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -79,10 +79,10 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -99,7 +99,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01470_a1-optimized.cl b/OpenCL/m01470_a1-optimized.cl index 9274b8b53..ee1f43b85 100644 --- a/OpenCL/m01470_a1-optimized.cl +++ b/OpenCL/m01470_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -62,7 +62,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -100,7 +100,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -260,7 +260,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -282,24 +282,24 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -310,7 +310,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -348,7 +348,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01470_a1-pure.cl b/OpenCL/m01470_a1-pure.cl index 29a00f687..600c5a86d 100644 --- a/OpenCL/m01470_a1-pure.cl +++ b/OpenCL/m01470_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m01470_a3-optimized.cl b/OpenCL/m01470_a3-optimized.cl index 852d01204..41e5eee28 100644 --- a/OpenCL/m01470_a3-optimized.cl +++ b/OpenCL/m01470_a3-optimized.cl @@ -43,7 +43,7 @@ DECLSPEC void m01470m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -188,24 +188,24 @@ DECLSPEC void m01470s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -218,7 +218,7 @@ DECLSPEC void m01470s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -359,7 +359,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -395,7 +395,7 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) * main */ - m01470m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01470m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01470_m08 (KERN_ATTR_BASIC ()) @@ -406,7 +406,7 @@ KERNEL_FQ void m01470_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -442,7 +442,7 @@ KERNEL_FQ void m01470_m08 (KERN_ATTR_BASIC ()) * main */ - m01470m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01470m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01470_m16 (KERN_ATTR_BASIC ()) @@ -453,7 +453,7 @@ KERNEL_FQ void m01470_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -489,7 +489,7 @@ KERNEL_FQ void m01470_m16 (KERN_ATTR_BASIC ()) * main */ - m01470m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01470m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) @@ -500,7 +500,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -536,7 +536,7 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) * main */ - m01470s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01470s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01470_s08 (KERN_ATTR_BASIC ()) @@ -547,7 +547,7 @@ KERNEL_FQ void m01470_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -583,7 +583,7 @@ KERNEL_FQ void m01470_s08 (KERN_ATTR_BASIC ()) * main */ - m01470s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01470s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01470_s16 (KERN_ATTR_BASIC ()) @@ -594,7 +594,7 @@ KERNEL_FQ void m01470_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -630,5 +630,5 @@ KERNEL_FQ void m01470_s16 (KERN_ATTR_BASIC ()) * main */ - m01470s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01470s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01470_a3-pure.cl b/OpenCL/m01470_a3-pure.cl index 2f4c3cf1b..708754217 100644 --- a/OpenCL/m01470_a3-pure.cl +++ b/OpenCL/m01470_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -48,7 +48,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -82,7 +82,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -90,10 +90,10 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -119,7 +119,7 @@ KERNEL_FQ void m01470_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01500_a0-pure.cl b/OpenCL/m01500_a0-pure.cl index 91c43b742..6db09f430 100644 --- a/OpenCL/m01500_a0-pure.cl +++ b/OpenCL/m01500_a0-pure.cl @@ -522,7 +522,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -534,13 +534,13 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_RULES ()) * salt */ - const u32 mask = salt_bufs[SALT_POS].salt_buf[0]; + const u32 mask = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * main */ - 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) { pw_t tmp = PASTE_PW; @@ -606,7 +606,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -618,7 +618,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_RULES ()) * salt */ - const u32 mask = salt_bufs[SALT_POS].salt_buf[0]; + const u32 mask = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -626,8 +626,8 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -636,7 +636,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_RULES ()) * main */ - 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) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01500_a1-pure.cl b/OpenCL/m01500_a1-pure.cl index 921ee002d..2425cc521 100644 --- a/OpenCL/m01500_a1-pure.cl +++ b/OpenCL/m01500_a1-pure.cl @@ -520,7 +520,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -544,13 +544,13 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BASIC ()) * salt */ - const u32 mask = salt_bufs[SALT_POS].salt_buf[0]; + const u32 mask = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -588,7 +588,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -683,7 +683,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -707,7 +707,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ()) * salt */ - const u32 mask = salt_bufs[SALT_POS].salt_buf[0]; + const u32 mask = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -715,8 +715,8 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -725,7 +725,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -763,7 +763,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01500_a3-pure.cl b/OpenCL/m01500_a3-pure.cl index 7a5adf017..35ae97bb8 100644 --- a/OpenCL/m01500_a3-pure.cl +++ b/OpenCL/m01500_a3-pure.cl @@ -1920,13 +1920,13 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BITSLICE ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 salt = salt_bufs[SALT_POS].salt_buf[0]; + const u32 salt = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * base @@ -1999,7 +1999,7 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BITSLICE ()) * inner loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos += 32) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos += 32) { u32 k00 = K00; u32 k01 = K01; @@ -2214,11 +2214,11 @@ KERNEL_FQ void m01500_mxx (KERN_ATTR_BITSLICE ()) out[62] = D62; out[63] = D63; - if (digests_cnt < 16) + if (DIGESTS_CNT < 16) { - for (u32 d = 0; d < digests_cnt; d++) + for (u32 d = 0; d < DIGESTS_CNT; d++) { - const u32 final_hash_pos = DIGESTS_OFFSET + d; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + d; if (hashes_shown[final_hash_pos]) continue; @@ -2293,13 +2293,13 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BITSLICE ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 salt = salt_bufs[SALT_POS].salt_buf[0]; + const u32 salt = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -2444,7 +2444,7 @@ KERNEL_FQ void m01500_sxx (KERN_ATTR_BITSLICE ()) * inner loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos += 32) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos += 32) { u32 k00 = K00; u32 k01 = K01; diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl index 62194e973..e8ec025ac 100644 --- a/OpenCL/m01600-optimized.cl +++ b/OpenCL/m01600-optimized.cl @@ -682,7 +682,7 @@ KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -699,10 +699,10 @@ KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * init @@ -845,7 +845,7 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -871,10 +871,10 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -923,7 +923,7 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) block3[2] = 0; block3[3] = 0; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { block1[0] = 0; block1[1] = 0; @@ -1033,7 +1033,7 @@ KERNEL_FQ void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m01600-pure.cl b/OpenCL/m01600-pure.cl index d978181c0..48ba3f35c 100644 --- a/OpenCL/m01600-pure.cl +++ b/OpenCL/m01600-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -48,13 +48,13 @@ KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -140,7 +140,7 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -155,13 +155,13 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -179,7 +179,7 @@ KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) * loop */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { md5_ctx_t md5_ctx; @@ -235,7 +235,7 @@ KERNEL_FQ void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl index dcc4c217e..072d1b245 100644 --- a/OpenCL/m01700_a0-optimized.cl +++ b/OpenCL/m01700_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,7 +156,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -237,7 +237,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -259,17 +259,17 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01700_a0-pure.cl b/OpenCL/m01700_a0-pure.cl index 969bce2bd..cd9ae7563 100644 --- a/OpenCL/m01700_a0-pure.cl +++ b/OpenCL/m01700_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01700_a1-optimized.cl b/OpenCL/m01700_a1-optimized.cl index 6ca96c818..c98f1ce29 100644 --- a/OpenCL/m01700_a1-optimized.cl +++ b/OpenCL/m01700_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,7 +154,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -192,7 +192,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -293,7 +293,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -315,17 +315,17 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -363,7 +363,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01700_a1-pure.cl b/OpenCL/m01700_a1-pure.cl index 8865fc4ce..923393ead 100644 --- a/OpenCL/m01700_a1-pure.cl +++ b/OpenCL/m01700_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m01700_a3-optimized.cl b/OpenCL/m01700_a3-optimized.cl index 6444cfae0..c7aa14442 100644 --- a/OpenCL/m01700_a3-optimized.cl +++ b/OpenCL/m01700_a3-optimized.cl @@ -135,7 +135,7 @@ DECLSPEC void m01700m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -200,10 +200,10 @@ DECLSPEC void m01700s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -212,7 +212,7 @@ DECLSPEC void m01700s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -270,7 +270,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -297,7 +297,7 @@ KERNEL_FQ void m01700_m04 (KERN_ATTR_VECTOR ()) * main */ - m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01700_m08 (KERN_ATTR_VECTOR ()) @@ -308,7 +308,7 @@ KERNEL_FQ void m01700_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -335,7 +335,7 @@ KERNEL_FQ void m01700_m08 (KERN_ATTR_VECTOR ()) * main */ - m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01700_m16 (KERN_ATTR_VECTOR ()) @@ -346,7 +346,7 @@ KERNEL_FQ void m01700_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -373,7 +373,7 @@ KERNEL_FQ void m01700_m16 (KERN_ATTR_VECTOR ()) * main */ - m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01700_s04 (KERN_ATTR_VECTOR ()) @@ -384,7 +384,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -411,7 +411,7 @@ KERNEL_FQ void m01700_s04 (KERN_ATTR_VECTOR ()) * main */ - m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01700_s08 (KERN_ATTR_VECTOR ()) @@ -422,7 +422,7 @@ KERNEL_FQ void m01700_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -449,7 +449,7 @@ KERNEL_FQ void m01700_s08 (KERN_ATTR_VECTOR ()) * main */ - m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01700_s16 (KERN_ATTR_VECTOR ()) @@ -460,7 +460,7 @@ KERNEL_FQ void m01700_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -487,5 +487,5 @@ KERNEL_FQ void m01700_s16 (KERN_ATTR_VECTOR ()) * main */ - m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01700_a3-pure.cl b/OpenCL/m01700_a3-pure.cl index 3cab23609..bea37d8f5 100644 --- a/OpenCL/m01700_a3-pure.cl +++ b/OpenCL/m01700_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m01700_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m01700_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl index 2c72b062f..6956a6aef 100644 --- a/OpenCL/m01710_a0-optimized.cl +++ b/OpenCL/m01710_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -310,7 +310,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -335,24 +335,24 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -360,17 +360,17 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01710_a0-pure.cl b/OpenCL/m01710_a0-pure.cl index acf297478..f09a7fdb4 100644 --- a/OpenCL/m01710_a0-pure.cl +++ b/OpenCL/m01710_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01710_a1-optimized.cl b/OpenCL/m01710_a1-optimized.cl index 45111549b..c4fcf6c6f 100644 --- a/OpenCL/m01710_a1-optimized.cl +++ b/OpenCL/m01710_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -368,7 +368,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -393,24 +393,24 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -418,17 +418,17 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -466,7 +466,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01710_a1-pure.cl b/OpenCL/m01710_a1-pure.cl index 58442464e..071fe90f5 100644 --- a/OpenCL/m01710_a1-pure.cl +++ b/OpenCL/m01710_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m01710_a3-optimized.cl b/OpenCL/m01710_a3-optimized.cl index 76a331f7e..9e13827ec 100644 --- a/OpenCL/m01710_a3-optimized.cl +++ b/OpenCL/m01710_a3-optimized.cl @@ -138,22 +138,22 @@ DECLSPEC void m01710m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -174,7 +174,7 @@ DECLSPEC void m01710m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -186,7 +186,7 @@ DECLSPEC void m01710m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -251,10 +251,10 @@ DECLSPEC void m01710s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -263,7 +263,7 @@ DECLSPEC void m01710s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -321,7 +321,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -348,7 +348,7 @@ KERNEL_FQ void m01710_m04 (KERN_ATTR_VECTOR ()) * main */ - m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01710_m08 (KERN_ATTR_VECTOR ()) @@ -359,7 +359,7 @@ KERNEL_FQ void m01710_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -386,7 +386,7 @@ KERNEL_FQ void m01710_m08 (KERN_ATTR_VECTOR ()) * main */ - m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01710_m16 (KERN_ATTR_VECTOR ()) @@ -397,7 +397,7 @@ KERNEL_FQ void m01710_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -424,7 +424,7 @@ KERNEL_FQ void m01710_m16 (KERN_ATTR_VECTOR ()) * main */ - m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01710_s04 (KERN_ATTR_VECTOR ()) @@ -435,7 +435,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -462,7 +462,7 @@ KERNEL_FQ void m01710_s04 (KERN_ATTR_VECTOR ()) * main */ - m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01710_s08 (KERN_ATTR_VECTOR ()) @@ -473,7 +473,7 @@ KERNEL_FQ void m01710_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -500,7 +500,7 @@ KERNEL_FQ void m01710_s08 (KERN_ATTR_VECTOR ()) * main */ - m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01710_s16 (KERN_ATTR_VECTOR ()) @@ -511,7 +511,7 @@ KERNEL_FQ void m01710_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -538,5 +538,5 @@ KERNEL_FQ void m01710_s16 (KERN_ATTR_VECTOR ()) * main */ - m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01710_a3-pure.cl b/OpenCL/m01710_a3-pure.cl index 9fe7dd7fd..91168c138 100644 --- a/OpenCL/m01710_a3-pure.cl +++ b/OpenCL/m01710_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01710_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m01710_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl index bfb0bb37e..90dcff5c9 100644 --- a/OpenCL/m01720_a0-optimized.cl +++ b/OpenCL/m01720_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -290,7 +290,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -315,24 +315,24 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -340,17 +340,17 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01720_a0-pure.cl b/OpenCL/m01720_a0-pure.cl index accce0ea1..7b0850211 100644 --- a/OpenCL/m01720_a0-pure.cl +++ b/OpenCL/m01720_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_RULES ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_RULES ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01720_a1-optimized.cl b/OpenCL/m01720_a1-optimized.cl index ade402112..490299f77 100644 --- a/OpenCL/m01720_a1-optimized.cl +++ b/OpenCL/m01720_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -346,7 +346,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -371,24 +371,24 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -396,17 +396,17 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -444,7 +444,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01720_a1-pure.cl b/OpenCL/m01720_a1-pure.cl index 4ad390a26..3219c6660 100644 --- a/OpenCL/m01720_a1-pure.cl +++ b/OpenCL/m01720_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_BASIC ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_BASIC ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m01720_a3-optimized.cl b/OpenCL/m01720_a3-optimized.cl index 5dfc2b9d2..2a41cdafb 100644 --- a/OpenCL/m01720_a3-optimized.cl +++ b/OpenCL/m01720_a3-optimized.cl @@ -138,24 +138,24 @@ DECLSPEC void m01720m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m01720m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -253,10 +253,10 @@ DECLSPEC void m01720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -268,24 +268,24 @@ DECLSPEC void m01720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -295,7 +295,7 @@ DECLSPEC void m01720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -376,7 +376,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -412,7 +412,7 @@ KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) * main */ - m01720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01720_m08 (KERN_ATTR_BASIC ()) @@ -423,7 +423,7 @@ KERNEL_FQ void m01720_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -459,7 +459,7 @@ KERNEL_FQ void m01720_m08 (KERN_ATTR_BASIC ()) * main */ - m01720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01720_m16 (KERN_ATTR_BASIC ()) @@ -470,7 +470,7 @@ KERNEL_FQ void m01720_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -506,7 +506,7 @@ KERNEL_FQ void m01720_m16 (KERN_ATTR_BASIC ()) * main */ - m01720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) @@ -517,7 +517,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -553,7 +553,7 @@ KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) * main */ - m01720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01720_s08 (KERN_ATTR_BASIC ()) @@ -564,7 +564,7 @@ KERNEL_FQ void m01720_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -600,7 +600,7 @@ KERNEL_FQ void m01720_s08 (KERN_ATTR_BASIC ()) * main */ - m01720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01720_s16 (KERN_ATTR_BASIC ()) @@ -611,7 +611,7 @@ KERNEL_FQ void m01720_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -647,5 +647,5 @@ KERNEL_FQ void m01720_s16 (KERN_ATTR_BASIC ()) * main */ - m01720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01720_a3-pure.cl b/OpenCL/m01720_a3-pure.cl index 467813061..becab2aea 100644 --- a/OpenCL/m01720_a3-pure.cl +++ b/OpenCL/m01720_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_VECTOR ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m01720_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_VECTOR ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m01720_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl index 14a965c4b..1c1424862 100644 --- a/OpenCL/m01730_a0-optimized.cl +++ b/OpenCL/m01730_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -315,7 +315,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,24 +340,24 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -365,17 +365,17 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01730_a0-pure.cl b/OpenCL/m01730_a0-pure.cl index 1eb44963e..ce164228e 100644 --- a/OpenCL/m01730_a0-pure.cl +++ b/OpenCL/m01730_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01730_a1-optimized.cl b/OpenCL/m01730_a1-optimized.cl index 0fe9c945d..ba9de9f83 100644 --- a/OpenCL/m01730_a1-optimized.cl +++ b/OpenCL/m01730_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -373,7 +373,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -398,24 +398,24 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -423,17 +423,17 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -471,7 +471,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01730_a1-pure.cl b/OpenCL/m01730_a1-pure.cl index 43238b0a9..78735e57d 100644 --- a/OpenCL/m01730_a1-pure.cl +++ b/OpenCL/m01730_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m01730_a3-optimized.cl b/OpenCL/m01730_a3-optimized.cl index e533b3e95..f15dadc6a 100644 --- a/OpenCL/m01730_a3-optimized.cl +++ b/OpenCL/m01730_a3-optimized.cl @@ -138,22 +138,22 @@ DECLSPEC void m01730m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -174,7 +174,7 @@ DECLSPEC void m01730m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -186,7 +186,7 @@ DECLSPEC void m01730m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -251,10 +251,10 @@ DECLSPEC void m01730s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -263,7 +263,7 @@ DECLSPEC void m01730s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -321,7 +321,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -348,7 +348,7 @@ KERNEL_FQ void m01730_m04 (KERN_ATTR_VECTOR ()) * main */ - m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01730_m08 (KERN_ATTR_VECTOR ()) @@ -359,7 +359,7 @@ KERNEL_FQ void m01730_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -386,7 +386,7 @@ KERNEL_FQ void m01730_m08 (KERN_ATTR_VECTOR ()) * main */ - m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01730_m16 (KERN_ATTR_VECTOR ()) @@ -397,7 +397,7 @@ KERNEL_FQ void m01730_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -424,7 +424,7 @@ KERNEL_FQ void m01730_m16 (KERN_ATTR_VECTOR ()) * main */ - m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01730_s04 (KERN_ATTR_VECTOR ()) @@ -435,7 +435,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -462,7 +462,7 @@ KERNEL_FQ void m01730_s04 (KERN_ATTR_VECTOR ()) * main */ - m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01730_s08 (KERN_ATTR_VECTOR ()) @@ -473,7 +473,7 @@ KERNEL_FQ void m01730_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -500,7 +500,7 @@ KERNEL_FQ void m01730_s08 (KERN_ATTR_VECTOR ()) * main */ - m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01730_s16 (KERN_ATTR_VECTOR ()) @@ -511,7 +511,7 @@ KERNEL_FQ void m01730_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -538,5 +538,5 @@ KERNEL_FQ void m01730_s16 (KERN_ATTR_VECTOR ()) * main */ - m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01730_a3-pure.cl b/OpenCL/m01730_a3-pure.cl index 511a32c1a..40d0c3418 100644 --- a/OpenCL/m01730_a3-pure.cl +++ b/OpenCL/m01730_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01730_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m01730_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl index b9be203f5..6ba949bee 100644 --- a/OpenCL/m01740_a0-optimized.cl +++ b/OpenCL/m01740_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -295,7 +295,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -320,24 +320,24 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -345,17 +345,17 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01740_a0-pure.cl b/OpenCL/m01740_a0-pure.cl index eab0e000c..4f31b9c62 100644 --- a/OpenCL/m01740_a0-pure.cl +++ b/OpenCL/m01740_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_RULES ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_RULES ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01740_a1-optimized.cl b/OpenCL/m01740_a1-optimized.cl index 599cdcbad..cd1517a35 100644 --- a/OpenCL/m01740_a1-optimized.cl +++ b/OpenCL/m01740_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -351,7 +351,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -376,24 +376,24 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -401,17 +401,17 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -449,7 +449,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01740_a1-pure.cl b/OpenCL/m01740_a1-pure.cl index 6f8aab601..f23e6728f 100644 --- a/OpenCL/m01740_a1-pure.cl +++ b/OpenCL/m01740_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_BASIC ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_BASIC ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m01740_a3-optimized.cl b/OpenCL/m01740_a3-optimized.cl index d432b4f4f..f3fef207b 100644 --- a/OpenCL/m01740_a3-optimized.cl +++ b/OpenCL/m01740_a3-optimized.cl @@ -138,24 +138,24 @@ DECLSPEC void m01740m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m01740m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -253,10 +253,10 @@ DECLSPEC void m01740s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -268,24 +268,24 @@ DECLSPEC void m01740s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -295,7 +295,7 @@ DECLSPEC void m01740s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -376,7 +376,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -412,7 +412,7 @@ KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) * main */ - m01740m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01740m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01740_m08 (KERN_ATTR_BASIC ()) @@ -423,7 +423,7 @@ KERNEL_FQ void m01740_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -459,7 +459,7 @@ KERNEL_FQ void m01740_m08 (KERN_ATTR_BASIC ()) * main */ - m01740m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01740m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01740_m16 (KERN_ATTR_BASIC ()) @@ -470,7 +470,7 @@ KERNEL_FQ void m01740_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -506,7 +506,7 @@ KERNEL_FQ void m01740_m16 (KERN_ATTR_BASIC ()) * main */ - m01740m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01740m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) @@ -517,7 +517,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -553,7 +553,7 @@ KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) * main */ - m01740s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01740s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01740_s08 (KERN_ATTR_BASIC ()) @@ -564,7 +564,7 @@ KERNEL_FQ void m01740_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -600,7 +600,7 @@ KERNEL_FQ void m01740_s08 (KERN_ATTR_BASIC ()) * main */ - m01740s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01740s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01740_s16 (KERN_ATTR_BASIC ()) @@ -611,7 +611,7 @@ KERNEL_FQ void m01740_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -647,5 +647,5 @@ KERNEL_FQ void m01740_s16 (KERN_ATTR_BASIC ()) * main */ - m01740s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01740s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01740_a3-pure.cl b/OpenCL/m01740_a3-pure.cl index f5f457423..64f35b445 100644 --- a/OpenCL/m01740_a3-pure.cl +++ b/OpenCL/m01740_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_VECTOR ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m01740_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_VECTOR ()) sha512_init (&ctx0); - sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m01740_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01750_a0-optimized.cl b/OpenCL/m01750_a0-optimized.cl index ad7ad6fbf..7ac25ce67 100644 --- a/OpenCL/m01750_a0-optimized.cl +++ b/OpenCL/m01750_a0-optimized.cl @@ -205,7 +205,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -230,30 +230,30 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -332,7 +332,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -357,24 +357,24 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -382,17 +382,17 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01750_a0-pure.cl b/OpenCL/m01750_a0-pure.cl index cb990b529..1774ced1c 100644 --- a/OpenCL/m01750_a0-pure.cl +++ b/OpenCL/m01750_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -78,7 +78,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -98,20 +98,20 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01750_a1-optimized.cl b/OpenCL/m01750_a1-optimized.cl index df40b6b19..bc269792b 100644 --- a/OpenCL/m01750_a1-optimized.cl +++ b/OpenCL/m01750_a1-optimized.cl @@ -203,7 +203,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -228,30 +228,30 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -289,7 +289,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -398,7 +398,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -423,24 +423,24 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -448,17 +448,17 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -496,7 +496,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01750_a1-pure.cl b/OpenCL/m01750_a1-pure.cl index e0c7c36f4..ffed39764 100644 --- a/OpenCL/m01750_a1-pure.cl +++ b/OpenCL/m01750_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -101,7 +101,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -128,20 +128,20 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m01750_a3-optimized.cl b/OpenCL/m01750_a3-optimized.cl index 01a42f37b..738d936b2 100644 --- a/OpenCL/m01750_a3-optimized.cl +++ b/OpenCL/m01750_a3-optimized.cl @@ -207,24 +207,24 @@ DECLSPEC void m01750m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -232,7 +232,7 @@ DECLSPEC void m01750m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -317,24 +317,24 @@ DECLSPEC void m01750s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -342,10 +342,10 @@ DECLSPEC void m01750s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -354,7 +354,7 @@ DECLSPEC void m01750s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -429,7 +429,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -465,7 +465,7 @@ KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) * main */ - m01750m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01750m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01750_m08 (KERN_ATTR_BASIC ()) @@ -476,7 +476,7 @@ KERNEL_FQ void m01750_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -512,7 +512,7 @@ KERNEL_FQ void m01750_m08 (KERN_ATTR_BASIC ()) * main */ - m01750m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01750m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01750_m16 (KERN_ATTR_BASIC ()) @@ -523,7 +523,7 @@ KERNEL_FQ void m01750_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -559,7 +559,7 @@ KERNEL_FQ void m01750_m16 (KERN_ATTR_BASIC ()) * main */ - m01750m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01750m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) @@ -570,7 +570,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -606,7 +606,7 @@ KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) * main */ - m01750s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01750s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01750_s08 (KERN_ATTR_BASIC ()) @@ -617,7 +617,7 @@ KERNEL_FQ void m01750_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -653,7 +653,7 @@ KERNEL_FQ void m01750_s08 (KERN_ATTR_BASIC ()) * main */ - m01750s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01750s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01750_s16 (KERN_ATTR_BASIC ()) @@ -664,7 +664,7 @@ KERNEL_FQ void m01750_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -700,5 +700,5 @@ KERNEL_FQ void m01750_s16 (KERN_ATTR_BASIC ()) * main */ - m01750s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01750s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01750_a3-pure.cl b/OpenCL/m01750_a3-pure.cl index 2dc5f74bf..3d7f81f59 100644 --- a/OpenCL/m01750_a3-pure.cl +++ b/OpenCL/m01750_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m01750_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -87,7 +87,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -114,13 +114,13 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -129,7 +129,7 @@ KERNEL_FQ void m01750_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl index e72f51a1d..04c906bfa 100644 --- a/OpenCL/m01760_a0-optimized.cl +++ b/OpenCL/m01760_a0-optimized.cl @@ -205,7 +205,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -230,22 +230,22 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -282,7 +282,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -345,7 +345,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -370,22 +370,22 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -424,17 +424,17 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01760_a0-pure.cl b/OpenCL/m01760_a0-pure.cl index 1b06081ea..5f1d92632 100644 --- a/OpenCL/m01760_a0-pure.cl +++ b/OpenCL/m01760_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_hmac_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,13 +100,13 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_hmac_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01760_a1-optimized.cl b/OpenCL/m01760_a1-optimized.cl index 7d6cfcedc..25ead9af1 100644 --- a/OpenCL/m01760_a1-optimized.cl +++ b/OpenCL/m01760_a1-optimized.cl @@ -203,7 +203,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -228,22 +228,22 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -280,7 +280,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -318,7 +318,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -403,7 +403,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -428,22 +428,22 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -482,17 +482,17 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -530,7 +530,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01760_a1-pure.cl b/OpenCL/m01760_a1-pure.cl index 2ecfc200e..0e26d5e26 100644 --- a/OpenCL/m01760_a1-pure.cl +++ b/OpenCL/m01760_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_hmac_ctx_t ctx0; @@ -55,7 +55,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -103,7 +103,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -111,10 +111,10 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -130,13 +130,13 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_hmac_ctx_t ctx0; @@ -147,7 +147,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m01760_a3-optimized.cl b/OpenCL/m01760_a3-optimized.cl index a317932a2..e110a717a 100644 --- a/OpenCL/m01760_a3-optimized.cl +++ b/OpenCL/m01760_a3-optimized.cl @@ -207,22 +207,22 @@ DECLSPEC void m01760m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -261,7 +261,7 @@ DECLSPEC void m01760m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -315,22 +315,22 @@ DECLSPEC void m01760s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); /** * pads @@ -369,10 +369,10 @@ DECLSPEC void m01760s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -381,7 +381,7 @@ DECLSPEC void m01760s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -425,7 +425,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -461,7 +461,7 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) * main */ - m01760m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01760m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01760_m08 (KERN_ATTR_BASIC ()) @@ -472,7 +472,7 @@ KERNEL_FQ void m01760_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -508,7 +508,7 @@ KERNEL_FQ void m01760_m08 (KERN_ATTR_BASIC ()) * main */ - m01760m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01760m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01760_m16 (KERN_ATTR_BASIC ()) @@ -519,7 +519,7 @@ KERNEL_FQ void m01760_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -555,7 +555,7 @@ KERNEL_FQ void m01760_m16 (KERN_ATTR_BASIC ()) * main */ - m01760m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01760m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) @@ -566,7 +566,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -602,7 +602,7 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) * main */ - m01760s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01760s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01760_s08 (KERN_ATTR_BASIC ()) @@ -613,7 +613,7 @@ KERNEL_FQ void m01760_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -649,7 +649,7 @@ KERNEL_FQ void m01760_s08 (KERN_ATTR_BASIC ()) * main */ - m01760s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01760s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01760_s16 (KERN_ATTR_BASIC ()) @@ -660,7 +660,7 @@ KERNEL_FQ void m01760_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -696,5 +696,5 @@ KERNEL_FQ void m01760_s16 (KERN_ATTR_BASIC ()) * main */ - m01760s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01760s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01760_a3-pure.cl b/OpenCL/m01760_a3-pure.cl index a154f6ec9..c2a2f4bcc 100644 --- a/OpenCL/m01760_a3-pure.cl +++ b/OpenCL/m01760_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_hmac_ctx_vector_t ctx0; @@ -57,7 +57,7 @@ KERNEL_FQ void m01760_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_hmac_ctx_vector_t ctx0; @@ -135,7 +135,7 @@ KERNEL_FQ void m01760_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01770_a0-optimized.cl b/OpenCL/m01770_a0-optimized.cl index c52d6ef37..a0472ee01 100644 --- a/OpenCL/m01770_a0-optimized.cl +++ b/OpenCL/m01770_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,7 +156,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -242,7 +242,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -264,17 +264,17 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m01770_a0-pure.cl b/OpenCL/m01770_a0-pure.cl index aa0a2c029..0e96aac92 100644 --- a/OpenCL/m01770_a0-pure.cl +++ b/OpenCL/m01770_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m01770_a1-optimized.cl b/OpenCL/m01770_a1-optimized.cl index 9562fa1fb..211e515e9 100644 --- a/OpenCL/m01770_a1-optimized.cl +++ b/OpenCL/m01770_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,7 +154,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -192,7 +192,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -298,7 +298,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -320,17 +320,17 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -368,7 +368,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m01770_a1-pure.cl b/OpenCL/m01770_a1-pure.cl index 8f16a9407..6cd4cb56d 100644 --- a/OpenCL/m01770_a1-pure.cl +++ b/OpenCL/m01770_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m01770_a3-optimized.cl b/OpenCL/m01770_a3-optimized.cl index 2f217919e..d15cb8ef3 100644 --- a/OpenCL/m01770_a3-optimized.cl +++ b/OpenCL/m01770_a3-optimized.cl @@ -137,7 +137,7 @@ DECLSPEC void m01770m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -202,10 +202,10 @@ DECLSPEC void m01770s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -214,7 +214,7 @@ DECLSPEC void m01770s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -272,7 +272,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -299,7 +299,7 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_VECTOR ()) * main */ - m01770m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01770m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01770_m08 (KERN_ATTR_VECTOR ()) @@ -310,7 +310,7 @@ KERNEL_FQ void m01770_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -337,7 +337,7 @@ KERNEL_FQ void m01770_m08 (KERN_ATTR_VECTOR ()) * main */ - m01770m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01770m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01770_m16 (KERN_ATTR_VECTOR ()) @@ -348,7 +348,7 @@ KERNEL_FQ void m01770_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -375,7 +375,7 @@ KERNEL_FQ void m01770_m16 (KERN_ATTR_VECTOR ()) * main */ - m01770m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01770m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01770_s04 (KERN_ATTR_VECTOR ()) @@ -386,7 +386,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -413,7 +413,7 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_VECTOR ()) * main */ - m01770s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01770s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01770_s08 (KERN_ATTR_VECTOR ()) @@ -424,7 +424,7 @@ KERNEL_FQ void m01770_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -451,7 +451,7 @@ KERNEL_FQ void m01770_s08 (KERN_ATTR_VECTOR ()) * main */ - m01770s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01770s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m01770_s16 (KERN_ATTR_VECTOR ()) @@ -462,7 +462,7 @@ KERNEL_FQ void m01770_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -489,5 +489,5 @@ KERNEL_FQ void m01770_s16 (KERN_ATTR_VECTOR ()) * main */ - m01770s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m01770s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m01770_a3-pure.cl b/OpenCL/m01770_a3-pure.cl index 5a1791232..26f6b3f58 100644 --- a/OpenCL/m01770_a3-pure.cl +++ b/OpenCL/m01770_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m01770_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m01800-optimized.cl b/OpenCL/m01800-optimized.cl index 633ed4632..7ee794856 100644 --- a/OpenCL/m01800-optimized.cl +++ b/OpenCL/m01800-optimized.cl @@ -179,7 +179,7 @@ KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -196,12 +196,12 @@ KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; - u32 salt_len = salt_bufs[SALT_POS].salt_len; + u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * buffers @@ -308,7 +308,7 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u64 l_p_bytes0[2]; @@ -322,7 +322,7 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) l_s_bytes0[0] = tmps[gid].l_s_bytes[0]; l_s_bytes0[1] = tmps[gid].l_s_bytes[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 wpc_len[8]; @@ -404,7 +404,7 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) /* Repeatedly run the collected hash value through SHA512 to burn CPU cycles. */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { const u32 j1 = (j & 1) ? 1 : 0; const u32 j3 = (j % 3) ? 2 : 0; @@ -485,7 +485,7 @@ KERNEL_FQ void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m01800-pure.cl b/OpenCL/m01800-pure.cl index 626ed1a3a..c17385c1f 100644 --- a/OpenCL/m01800-pure.cl +++ b/OpenCL/m01800-pure.cl @@ -36,7 +36,7 @@ KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -56,13 +56,13 @@ KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) w[idx] = hc_swap32_S (w[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) @@ -321,11 +321,11 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pw_len = pws[gid].pw_len; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 alt_result[32] = { 0 }; @@ -337,7 +337,7 @@ KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) /* Repeatedly run the collected hash value through SHA512 to burn CPU cycles. */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { sha512_ctx_t ctx; @@ -405,7 +405,7 @@ KERNEL_FQ void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m02100-pure.cl b/OpenCL/m02100-pure.cl index 9242bf6e6..b9236608f 100644 --- a/OpenCL/m02100-pure.cl +++ b/OpenCL/m02100-pure.cl @@ -72,7 +72,7 @@ KERNEL_FQ void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // dcc1 @@ -95,7 +95,7 @@ KERNEL_FQ void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t)) md4_ctx2.len = 16; - md4_update_global_utf16le (&md4_ctx2, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md4_update_global_utf16le (&md4_ctx2, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md4_final (&md4_ctx2); @@ -144,7 +144,7 @@ KERNEL_FQ void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_utf16le_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_utf16le_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); w0[0] = 1; w0[1] = 0; @@ -187,7 +187,7 @@ KERNEL_FQ void m02100_loop (KERN_ATTR_TMPS (dcc2_tmp_t)) const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -222,7 +222,7 @@ KERNEL_FQ void m02100_loop (KERN_ATTR_TMPS (dcc2_tmp_t)) out[2] = packv (tmps, out, gid, 2); out[3] = packv (tmps, out, gid, 3); - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { u32x w0[4]; u32x w1[4]; @@ -274,7 +274,7 @@ KERNEL_FQ void m02100_comp (KERN_ATTR_TMPS (dcc2_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m02400_a0-optimized.cl b/OpenCL/m02400_a0-optimized.cl index 4370ca337..449316dcf 100644 --- a/OpenCL/m02400_a0-optimized.cl +++ b/OpenCL/m02400_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -199,7 +199,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -221,17 +221,17 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m02400_a1-optimized.cl b/OpenCL/m02400_a1-optimized.cl index 4e8619477..fa1526e8e 100644 --- a/OpenCL/m02400_a1-optimized.cl +++ b/OpenCL/m02400_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -261,7 +261,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -331,7 +331,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m02400_a3-optimized.cl b/OpenCL/m02400_a3-optimized.cl index bea333e54..5535763ec 100644 --- a/OpenCL/m02400_a3-optimized.cl +++ b/OpenCL/m02400_a3-optimized.cl @@ -139,7 +139,7 @@ DECLSPEC void m02400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -354,10 +354,10 @@ DECLSPEC void m02400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -366,7 +366,7 @@ DECLSPEC void m02400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -467,7 +467,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -494,7 +494,7 @@ KERNEL_FQ void m02400_m04 (KERN_ATTR_VECTOR ()) * main */ - m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02400_m08 (KERN_ATTR_VECTOR ()) @@ -505,7 +505,7 @@ KERNEL_FQ void m02400_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -532,7 +532,7 @@ KERNEL_FQ void m02400_m08 (KERN_ATTR_VECTOR ()) * main */ - m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02400_m16 (KERN_ATTR_VECTOR ()) @@ -543,7 +543,7 @@ KERNEL_FQ void m02400_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -570,7 +570,7 @@ KERNEL_FQ void m02400_m16 (KERN_ATTR_VECTOR ()) * main */ - m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02400_s04 (KERN_ATTR_VECTOR ()) @@ -581,7 +581,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -608,7 +608,7 @@ KERNEL_FQ void m02400_s04 (KERN_ATTR_VECTOR ()) * main */ - m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02400_s08 (KERN_ATTR_VECTOR ()) @@ -619,7 +619,7 @@ KERNEL_FQ void m02400_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -646,7 +646,7 @@ KERNEL_FQ void m02400_s08 (KERN_ATTR_VECTOR ()) * main */ - m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02400_s16 (KERN_ATTR_VECTOR ()) @@ -657,7 +657,7 @@ KERNEL_FQ void m02400_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -684,5 +684,5 @@ KERNEL_FQ void m02400_s16 (KERN_ATTR_VECTOR ()) * main */ - m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m02410_a0-optimized.cl b/OpenCL/m02410_a0-optimized.cl index 5a660c261..388e69f2d 100644 --- a/OpenCL/m02410_a0-optimized.cl +++ b/OpenCL/m02410_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,7 +55,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; salt_buf0[1] = 0; salt_buf0[2] = 0; salt_buf0[3] = 0; @@ -72,13 +72,13 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -278,7 +278,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -303,7 +303,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; salt_buf0[1] = 0; salt_buf0[2] = 0; salt_buf0[3] = 0; @@ -320,7 +320,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -328,17 +328,17 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m02410_a1-optimized.cl b/OpenCL/m02410_a1-optimized.cl index 7caee3a34..b4890d49f 100644 --- a/OpenCL/m02410_a1-optimized.cl +++ b/OpenCL/m02410_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,7 +53,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; salt_buf0[1] = 0; salt_buf0[2] = 0; salt_buf0[3] = 0; @@ -70,13 +70,13 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -336,7 +336,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -361,7 +361,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; salt_buf0[1] = 0; salt_buf0[2] = 0; salt_buf0[3] = 0; @@ -378,7 +378,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -386,17 +386,17 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -434,7 +434,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m02410_a3-optimized.cl b/OpenCL/m02410_a3-optimized.cl index 96952ef70..dfbe61018 100644 --- a/OpenCL/m02410_a3-optimized.cl +++ b/OpenCL/m02410_a3-optimized.cl @@ -32,7 +32,7 @@ DECLSPEC void m02410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; salt_buf0[1] = 0; salt_buf0[2] = 0; salt_buf0[3] = 0; @@ -49,7 +49,7 @@ DECLSPEC void m02410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -188,7 +188,7 @@ DECLSPEC void m02410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -296,7 +296,7 @@ DECLSPEC void m02410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; salt_buf0[1] = 0; salt_buf0[2] = 0; salt_buf0[3] = 0; @@ -313,7 +313,7 @@ DECLSPEC void m02410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -452,10 +452,10 @@ DECLSPEC void m02410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -464,7 +464,7 @@ DECLSPEC void m02410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -565,7 +565,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -592,7 +592,7 @@ KERNEL_FQ void m02410_m04 (KERN_ATTR_VECTOR ()) * main */ - m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02410_m08 (KERN_ATTR_VECTOR ()) @@ -603,7 +603,7 @@ KERNEL_FQ void m02410_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -630,7 +630,7 @@ KERNEL_FQ void m02410_m08 (KERN_ATTR_VECTOR ()) * main */ - m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02410_m16 (KERN_ATTR_VECTOR ()) @@ -641,7 +641,7 @@ KERNEL_FQ void m02410_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -668,7 +668,7 @@ KERNEL_FQ void m02410_m16 (KERN_ATTR_VECTOR ()) * main */ - m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02410_s04 (KERN_ATTR_VECTOR ()) @@ -679,7 +679,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -706,7 +706,7 @@ KERNEL_FQ void m02410_s04 (KERN_ATTR_VECTOR ()) * main */ - m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02410_s08 (KERN_ATTR_VECTOR ()) @@ -717,7 +717,7 @@ KERNEL_FQ void m02410_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -744,7 +744,7 @@ KERNEL_FQ void m02410_s08 (KERN_ATTR_VECTOR ()) * main */ - m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m02410_s16 (KERN_ATTR_VECTOR ()) @@ -755,7 +755,7 @@ KERNEL_FQ void m02410_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -782,5 +782,5 @@ KERNEL_FQ void m02410_s16 (KERN_ATTR_VECTOR ()) * main */ - m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m02500-pure.cl b/OpenCL/m02500-pure.cl index f6e20fa5b..1eb1e3a71 100644 --- a/OpenCL/m02500-pure.cl +++ b/OpenCL/m02500-pure.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m02500_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx0; @@ -154,7 +154,7 @@ KERNEL_FQ void m02500_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) tmps[gid].opad[3] = sha1_hmac_ctx0.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx0.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 w0[4]; u32 w1[4]; @@ -240,7 +240,7 @@ KERNEL_FQ void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -274,7 +274,7 @@ KERNEL_FQ void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) out[3] = packv (tmps, out, gid, 3); out[4] = packv (tmps, out, gid, 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -333,7 +333,7 @@ KERNEL_FQ void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) out[3] = packv (tmps, out, gid, 8); out[4] = packv (tmps, out, gid, 9); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -388,7 +388,7 @@ KERNEL_FQ void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -402,9 +402,9 @@ KERNEL_FQ void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; @@ -562,7 +562,7 @@ KERNEL_FQ void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -573,7 +573,7 @@ KERNEL_FQ void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -587,9 +587,9 @@ KERNEL_FQ void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; @@ -742,7 +742,7 @@ KERNEL_FQ void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -789,7 +789,7 @@ KERNEL_FQ void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -803,9 +803,9 @@ KERNEL_FQ void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; @@ -1028,7 +1028,7 @@ KERNEL_FQ void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } diff --git a/OpenCL/m02501-pure.cl b/OpenCL/m02501-pure.cl index dcf8e66f8..6f63f5ce1 100644 --- a/OpenCL/m02501-pure.cl +++ b/OpenCL/m02501-pure.cl @@ -106,7 +106,7 @@ KERNEL_FQ void m02501_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 in[16]; @@ -152,7 +152,7 @@ KERNEL_FQ void m02501_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; } KERNEL_FQ void m02501_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) @@ -164,7 +164,7 @@ KERNEL_FQ void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -178,9 +178,9 @@ KERNEL_FQ void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; @@ -338,7 +338,7 @@ KERNEL_FQ void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -349,7 +349,7 @@ KERNEL_FQ void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -363,9 +363,9 @@ KERNEL_FQ void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; @@ -518,7 +518,7 @@ KERNEL_FQ void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -565,7 +565,7 @@ KERNEL_FQ void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -579,9 +579,9 @@ KERNEL_FQ void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; @@ -804,7 +804,7 @@ KERNEL_FQ void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } diff --git a/OpenCL/m02610_a0-optimized.cl b/OpenCL/m02610_a0-optimized.cl index b90f4a5da..3f341898c 100644 --- a/OpenCL/m02610_a0-optimized.cl +++ b/OpenCL/m02610_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,12 +84,12 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -101,13 +101,13 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -339,7 +339,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -368,12 +368,12 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -385,7 +385,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -393,17 +393,17 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m02610_a0-pure.cl b/OpenCL/m02610_a0-pure.cl index 2bada9fa2..9443b8307 100644 --- a/OpenCL/m02610_a0-pure.cl +++ b/OpenCL/m02610_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,20 +63,20 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -158,7 +158,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -166,10 +166,10 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -178,20 +178,20 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m02610_a1-optimized.cl b/OpenCL/m02610_a1-optimized.cl index 8adbe4399..0c34d8265 100644 --- a/OpenCL/m02610_a1-optimized.cl +++ b/OpenCL/m02610_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,12 +82,12 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -99,13 +99,13 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -396,7 +396,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -425,12 +425,12 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -442,7 +442,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -450,17 +450,17 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -498,7 +498,7 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m02610_a1-pure.cl b/OpenCL/m02610_a1-pure.cl index a8e03d5f1..4b5d0646a 100644 --- a/OpenCL/m02610_a1-pure.cl +++ b/OpenCL/m02610_a1-pure.cl @@ -53,19 +53,19 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -154,7 +154,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -162,23 +162,23 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -191,7 +191,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m02610_a3-optimized.cl b/OpenCL/m02610_a3-optimized.cl index 434a2d9ea..6a7804302 100644 --- a/OpenCL/m02610_a3-optimized.cl +++ b/OpenCL/m02610_a3-optimized.cl @@ -44,12 +44,12 @@ DECLSPEC void m02610m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -61,7 +61,7 @@ DECLSPEC void m02610m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -69,7 +69,7 @@ DECLSPEC void m02610m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -302,12 +302,12 @@ DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -319,7 +319,7 @@ DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -327,10 +327,10 @@ DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -339,7 +339,7 @@ DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -619,13 +619,13 @@ KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02610m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02610m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02610_m08 (KERN_ATTR_BASIC ()) @@ -689,13 +689,13 @@ KERNEL_FQ void m02610_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02610m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02610m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02610_m16 (KERN_ATTR_BASIC ()) @@ -759,13 +759,13 @@ KERNEL_FQ void m02610_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02610m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02610m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) @@ -829,13 +829,13 @@ KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02610s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02610s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02610_s08 (KERN_ATTR_BASIC ()) @@ -899,13 +899,13 @@ KERNEL_FQ void m02610_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02610s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02610s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02610_s16 (KERN_ATTR_BASIC ()) @@ -969,11 +969,11 @@ KERNEL_FQ void m02610_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02610s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02610s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m02610_a3-pure.cl b/OpenCL/m02610_a3-pure.cl index cd69c59c3..0ef93d93d 100644 --- a/OpenCL/m02610_a3-pure.cl +++ b/OpenCL/m02610_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,13 +68,13 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m02610_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -167,7 +167,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -194,13 +194,13 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -209,7 +209,7 @@ KERNEL_FQ void m02610_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m02710_a0-optimized.cl b/OpenCL/m02710_a0-optimized.cl index 29fb94267..7bb4bb534 100644 --- a/OpenCL/m02710_a0-optimized.cl +++ b/OpenCL/m02710_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,14 +84,14 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -101,13 +101,13 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -424,7 +424,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -453,14 +453,14 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -470,7 +470,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -478,17 +478,17 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m02710_a1-optimized.cl b/OpenCL/m02710_a1-optimized.cl index 0c1a5e366..a653022ab 100644 --- a/OpenCL/m02710_a1-optimized.cl +++ b/OpenCL/m02710_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,14 +82,14 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -99,13 +99,13 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -481,7 +481,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -510,14 +510,14 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -527,7 +527,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -535,17 +535,17 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -583,7 +583,7 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m02710_a3-optimized.cl b/OpenCL/m02710_a3-optimized.cl index 750e462dd..799c6b964 100644 --- a/OpenCL/m02710_a3-optimized.cl +++ b/OpenCL/m02710_a3-optimized.cl @@ -44,14 +44,14 @@ DECLSPEC void m02710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -61,7 +61,7 @@ DECLSPEC void m02710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -69,7 +69,7 @@ DECLSPEC void m02710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -387,14 +387,14 @@ DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -404,7 +404,7 @@ DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -412,10 +412,10 @@ DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -424,7 +424,7 @@ DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -788,13 +788,13 @@ KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02710_m08 (KERN_ATTR_BASIC ()) @@ -858,13 +858,13 @@ KERNEL_FQ void m02710_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02710_m16 (KERN_ATTR_BASIC ()) @@ -928,13 +928,13 @@ KERNEL_FQ void m02710_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) @@ -998,13 +998,13 @@ KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02710_s08 (KERN_ATTR_BASIC ()) @@ -1068,13 +1068,13 @@ KERNEL_FQ void m02710_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02710_s16 (KERN_ATTR_BASIC ()) @@ -1138,11 +1138,11 @@ KERNEL_FQ void m02710_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl index ccbbb2689..714e558d0 100644 --- a/OpenCL/m02810_a0-optimized.cl +++ b/OpenCL/m02810_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,14 +84,14 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -105,7 +105,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -423,7 +423,7 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -452,14 +452,14 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -475,17 +475,17 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m02810_a0-pure.cl b/OpenCL/m02810_a0-pure.cl index fa85193ac..f198a7ce1 100644 --- a/OpenCL/m02810_a0-pure.cl +++ b/OpenCL/m02810_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -69,14 +69,14 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_RULES ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -181,7 +181,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -189,10 +189,10 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -207,14 +207,14 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_RULES ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m02810_a1-optimized.cl b/OpenCL/m02810_a1-optimized.cl index 4d87332f9..7dd007ebf 100644 --- a/OpenCL/m02810_a1-optimized.cl +++ b/OpenCL/m02810_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,14 +82,14 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -103,7 +103,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -141,7 +141,7 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -480,7 +480,7 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -509,14 +509,14 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -532,17 +532,17 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -580,7 +580,7 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m02810_a1-pure.cl b/OpenCL/m02810_a1-pure.cl index 6b5c0023d..f93b3c7b4 100644 --- a/OpenCL/m02810_a1-pure.cl +++ b/OpenCL/m02810_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -65,7 +65,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_BASIC ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } md5_ctx_t ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -177,7 +177,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -185,10 +185,10 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -201,7 +201,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_BASIC ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } md5_ctx_t ctx0; @@ -214,7 +214,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m02810_a3-optimized.cl b/OpenCL/m02810_a3-optimized.cl index ae295de95..205f6cedc 100644 --- a/OpenCL/m02810_a3-optimized.cl +++ b/OpenCL/m02810_a3-optimized.cl @@ -44,14 +44,14 @@ DECLSPEC void m02810m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -67,7 +67,7 @@ DECLSPEC void m02810m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -386,14 +386,14 @@ DECLSPEC void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -409,10 +409,10 @@ DECLSPEC void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -421,7 +421,7 @@ DECLSPEC void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -786,13 +786,13 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02810m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02810m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02810_m08 (KERN_ATTR_BASIC ()) @@ -856,13 +856,13 @@ KERNEL_FQ void m02810_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02810m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02810m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02810_m16 (KERN_ATTR_BASIC ()) @@ -926,13 +926,13 @@ KERNEL_FQ void m02810_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02810m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02810m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) @@ -996,13 +996,13 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02810s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02810s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02810_s08 (KERN_ATTR_BASIC ()) @@ -1066,13 +1066,13 @@ KERNEL_FQ void m02810_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02810s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02810s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m02810_s16 (KERN_ATTR_BASIC ()) @@ -1136,11 +1136,11 @@ KERNEL_FQ void m02810_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m02810s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m02810s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m02810_a3-pure.cl b/OpenCL/m02810_a3-pure.cl index 4ce6b49ba..857f2c037 100644 --- a/OpenCL/m02810_a3-pure.cl +++ b/OpenCL/m02810_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -74,7 +74,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_VECTOR ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m02810_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -190,7 +190,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -198,10 +198,10 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -223,7 +223,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_VECTOR ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** @@ -232,7 +232,7 @@ KERNEL_FQ void m02810_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m03000_a0-pure.cl b/OpenCL/m03000_a0-pure.cl index 6544361b1..bb226dae8 100644 --- a/OpenCL/m03000_a0-pure.cl +++ b/OpenCL/m03000_a0-pure.cl @@ -532,7 +532,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -544,7 +544,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_RULES ()) * main */ - 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) { pw_t tmp = PASTE_PW; @@ -617,7 +617,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -631,8 +631,8 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -641,7 +641,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_RULES ()) * main */ - 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) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m03000_a1-pure.cl b/OpenCL/m03000_a1-pure.cl index fe86172aa..fb6dc3e89 100644 --- a/OpenCL/m03000_a1-pure.cl +++ b/OpenCL/m03000_a1-pure.cl @@ -530,7 +530,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -554,7 +554,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -592,7 +592,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -694,7 +694,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -720,8 +720,8 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -730,7 +730,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -768,7 +768,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m03000_a3-pure.cl b/OpenCL/m03000_a3-pure.cl index 65beaabda..bb7e3ea6e 100644 --- a/OpenCL/m03000_a3-pure.cl +++ b/OpenCL/m03000_a3-pure.cl @@ -1761,7 +1761,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BITSLICE ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1831,7 +1831,7 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BITSLICE ()) * inner loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos += 32) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos += 32) { u32 k00 = K00; u32 k01 = K01; @@ -2055,11 +2055,11 @@ KERNEL_FQ void m03000_mxx (KERN_ATTR_BITSLICE ()) out[62] = D62; out[63] = D63; - if (digests_cnt < 16) + if (DIGESTS_CNT < 16) { - for (u32 d = 0; d < digests_cnt; d++) + for (u32 d = 0; d < DIGESTS_CNT; d++) { - const u32 final_hash_pos = DIGESTS_OFFSET + d; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + d; if (hashes_shown[final_hash_pos]) continue; @@ -2134,7 +2134,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BITSLICE ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -2276,7 +2276,7 @@ KERNEL_FQ void m03000_sxx (KERN_ATTR_BITSLICE ()) * inner loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos += 32) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos += 32) { u32 k00 = K00; u32 k01 = K01; diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl index 461f6bafa..97c1ac435 100644 --- a/OpenCL/m03100_a0-optimized.cl +++ b/OpenCL/m03100_a0-optimized.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -93,22 +93,22 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * main */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -298,7 +298,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -325,16 +325,16 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -342,8 +342,8 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -352,7 +352,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_RULES ()) * main */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m03100_a1-optimized.cl b/OpenCL/m03100_a1-optimized.cl index fce90f6d8..c3407003c 100644 --- a/OpenCL/m03100_a1-optimized.cl +++ b/OpenCL/m03100_a1-optimized.cl @@ -64,7 +64,7 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -91,22 +91,22 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -146,7 +146,7 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -356,7 +356,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -383,16 +383,16 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -400,8 +400,8 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -410,7 +410,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -450,7 +450,7 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m03100_a3-optimized.cl b/OpenCL/m03100_a3-optimized.cl index 3243060b8..6deca4484 100644 --- a/OpenCL/m03100_a3-optimized.cl +++ b/OpenCL/m03100_a3-optimized.cl @@ -30,16 +30,16 @@ DECLSPEC void m03100m (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_word_len = (salt_len + pw_len) * 2; @@ -49,7 +49,7 @@ DECLSPEC void m03100m (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -211,16 +211,16 @@ DECLSPEC void m03100s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_word_len = (salt_len + pw_len) * 2; @@ -230,8 +230,8 @@ DECLSPEC void m03100s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -242,7 +242,7 @@ DECLSPEC void m03100s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -462,13 +462,13 @@ KERNEL_FQ void m03100_m04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03100_m08 (KERN_ATTR_VECTOR ()) @@ -545,13 +545,13 @@ KERNEL_FQ void m03100_m08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03100_m16 (KERN_ATTR_VECTOR ()) @@ -632,13 +632,13 @@ KERNEL_FQ void m03100_s04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03100_s08 (KERN_ATTR_VECTOR ()) @@ -715,13 +715,13 @@ KERNEL_FQ void m03100_s08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03100_s16 (KERN_ATTR_VECTOR ()) diff --git a/OpenCL/m03200-pure.cl b/OpenCL/m03200-pure.cl index d58beee27..a622f703d 100644 --- a/OpenCL/m03200-pure.cl +++ b/OpenCL/m03200-pure.cl @@ -434,7 +434,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_init (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pw_len = pws[gid].pw_len; @@ -493,10 +493,10 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_init (KERN_ATTR_TMPS u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 P[18]; @@ -656,7 +656,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_loop (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load @@ -709,10 +709,10 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_loop (KERN_ATTR_TMPS u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * main loop @@ -721,7 +721,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_loop (KERN_ATTR_TMPS u32 L0; u32 R0; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { for (u32 i = 0; i < 18; i++) { @@ -859,7 +859,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03200_comp (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load diff --git a/OpenCL/m03500_a0-optimized.cl b/OpenCL/m03500_a0-optimized.cl index 0fdbafd51..217830c2c 100644 --- a/OpenCL/m03500_a0-optimized.cl +++ b/OpenCL/m03500_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,12 +84,12 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -101,13 +101,13 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -445,7 +445,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -474,12 +474,12 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -491,7 +491,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -499,17 +499,17 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m03500_a0-pure.cl b/OpenCL/m03500_a0-pure.cl index 6e0332968..fa3bcf4af 100644 --- a/OpenCL/m03500_a0-pure.cl +++ b/OpenCL/m03500_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,20 +63,20 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -188,7 +188,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -196,10 +196,10 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -208,20 +208,20 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m03500_a1-optimized.cl b/OpenCL/m03500_a1-optimized.cl index 93bdfa5fd..d1df183c8 100644 --- a/OpenCL/m03500_a1-optimized.cl +++ b/OpenCL/m03500_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,12 +82,12 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -99,13 +99,13 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -502,7 +502,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -531,12 +531,12 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -548,7 +548,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -556,17 +556,17 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -604,7 +604,7 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m03500_a1-pure.cl b/OpenCL/m03500_a1-pure.cl index f73218057..6ccd1e9ba 100644 --- a/OpenCL/m03500_a1-pure.cl +++ b/OpenCL/m03500_a1-pure.cl @@ -53,19 +53,19 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -184,7 +184,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -192,23 +192,23 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -221,7 +221,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m03500_a3-optimized.cl b/OpenCL/m03500_a3-optimized.cl index d37416c98..208659bba 100644 --- a/OpenCL/m03500_a3-optimized.cl +++ b/OpenCL/m03500_a3-optimized.cl @@ -44,12 +44,12 @@ DECLSPEC void m03500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -61,7 +61,7 @@ DECLSPEC void m03500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -69,7 +69,7 @@ DECLSPEC void m03500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -408,12 +408,12 @@ DECLSPEC void m03500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -425,7 +425,7 @@ DECLSPEC void m03500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -433,10 +433,10 @@ DECLSPEC void m03500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -445,7 +445,7 @@ DECLSPEC void m03500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -831,13 +831,13 @@ KERNEL_FQ void m03500_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03500_m08 (KERN_ATTR_BASIC ()) @@ -901,13 +901,13 @@ KERNEL_FQ void m03500_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03500_m16 (KERN_ATTR_BASIC ()) @@ -971,13 +971,13 @@ KERNEL_FQ void m03500_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) @@ -1041,13 +1041,13 @@ KERNEL_FQ void m03500_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03500_s08 (KERN_ATTR_BASIC ()) @@ -1111,13 +1111,13 @@ KERNEL_FQ void m03500_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03500_s16 (KERN_ATTR_BASIC ()) @@ -1181,11 +1181,11 @@ KERNEL_FQ void m03500_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m03500_a3-pure.cl b/OpenCL/m03500_a3-pure.cl index a952f9854..4103f8695 100644 --- a/OpenCL/m03500_a3-pure.cl +++ b/OpenCL/m03500_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,13 +68,13 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m03500_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -197,7 +197,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -205,10 +205,10 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -224,13 +224,13 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -239,7 +239,7 @@ KERNEL_FQ void m03500_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m03710_a0-optimized.cl b/OpenCL/m03710_a0-optimized.cl index a27d7b63a..d0f41a737 100644 --- a/OpenCL/m03710_a0-optimized.cl +++ b/OpenCL/m03710_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,24 +84,24 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -109,7 +109,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -370,7 +370,7 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -399,24 +399,24 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -426,17 +426,17 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m03710_a0-pure.cl b/OpenCL/m03710_a0-pure.cl index 5bcb06a07..acda044e9 100644 --- a/OpenCL/m03710_a0-pure.cl +++ b/OpenCL/m03710_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,20 +63,20 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -171,7 +171,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -179,10 +179,10 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -191,20 +191,20 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m03710_a1-optimized.cl b/OpenCL/m03710_a1-optimized.cl index cb0ca8050..1a051ffbb 100644 --- a/OpenCL/m03710_a1-optimized.cl +++ b/OpenCL/m03710_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,24 +82,24 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -107,7 +107,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -145,7 +145,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -427,7 +427,7 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -456,24 +456,24 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -483,17 +483,17 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -531,7 +531,7 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m03710_a1-pure.cl b/OpenCL/m03710_a1-pure.cl index 9ee3c5a9e..fe2e28429 100644 --- a/OpenCL/m03710_a1-pure.cl +++ b/OpenCL/m03710_a1-pure.cl @@ -53,19 +53,19 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -167,7 +167,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,23 +175,23 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -204,7 +204,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m03710_a3-optimized.cl b/OpenCL/m03710_a3-optimized.cl index 48f9dc8b4..56ec764e1 100644 --- a/OpenCL/m03710_a3-optimized.cl +++ b/OpenCL/m03710_a3-optimized.cl @@ -44,24 +44,24 @@ DECLSPEC void m03710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -71,7 +71,7 @@ DECLSPEC void m03710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -333,24 +333,24 @@ DECLSPEC void m03710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -360,10 +360,10 @@ DECLSPEC void m03710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -372,7 +372,7 @@ DECLSPEC void m03710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -646,7 +646,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -686,7 +686,7 @@ KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) * main */ - m03710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03710_m08 (KERN_ATTR_BASIC ()) @@ -750,13 +750,13 @@ KERNEL_FQ void m03710_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03710_m16 (KERN_ATTR_BASIC ()) @@ -820,13 +820,13 @@ KERNEL_FQ void m03710_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) @@ -890,13 +890,13 @@ KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03710_s08 (KERN_ATTR_BASIC ()) @@ -960,13 +960,13 @@ KERNEL_FQ void m03710_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03710_s16 (KERN_ATTR_BASIC ()) @@ -996,7 +996,7 @@ KERNEL_FQ void m03710_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1036,5 +1036,5 @@ KERNEL_FQ void m03710_s16 (KERN_ATTR_BASIC ()) * main */ - m03710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m03710_a3-pure.cl b/OpenCL/m03710_a3-pure.cl index 7168b6a67..ee6c90e85 100644 --- a/OpenCL/m03710_a3-pure.cl +++ b/OpenCL/m03710_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,13 +68,13 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m03710_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -180,7 +180,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -188,10 +188,10 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -207,13 +207,13 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -222,7 +222,7 @@ KERNEL_FQ void m03710_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m03800_a0-optimized.cl b/OpenCL/m03800_a0-optimized.cl index 0217ced72..739467b4b 100644 --- a/OpenCL/m03800_a0-optimized.cl +++ b/OpenCL/m03800_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -269,7 +269,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -294,24 +294,24 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -319,17 +319,17 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m03800_a0-pure.cl b/OpenCL/m03800_a0-pure.cl index a8938f7ee..0669a57c2 100644 --- a/OpenCL/m03800_a0-pure.cl +++ b/OpenCL/m03800_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -52,7 +52,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -84,7 +84,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -104,13 +104,13 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -123,7 +123,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m03800_a1-optimized.cl b/OpenCL/m03800_a1-optimized.cl index 57dce81c5..4a7f533a9 100644 --- a/OpenCL/m03800_a1-optimized.cl +++ b/OpenCL/m03800_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -327,7 +327,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -352,24 +352,24 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -377,17 +377,17 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -425,7 +425,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m03800_a1-pure.cl b/OpenCL/m03800_a1-pure.cl index 43ce752f9..6ef7f3d46 100644 --- a/OpenCL/m03800_a1-pure.cl +++ b/OpenCL/m03800_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,23 +86,23 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m03800_a3-optimized.cl b/OpenCL/m03800_a3-optimized.cl index cd16286e1..2abe79c95 100644 --- a/OpenCL/m03800_a3-optimized.cl +++ b/OpenCL/m03800_a3-optimized.cl @@ -32,46 +32,46 @@ DECLSPEC void m03800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -104,7 +104,7 @@ DECLSPEC void m03800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -256,46 +256,46 @@ DECLSPEC void m03800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -328,10 +328,10 @@ DECLSPEC void m03800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -340,7 +340,7 @@ DECLSPEC void m03800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -485,7 +485,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -527,7 +527,7 @@ KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) * main */ - m03800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03800_m08 (KERN_ATTR_BASIC ()) @@ -538,7 +538,7 @@ KERNEL_FQ void m03800_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -580,7 +580,7 @@ KERNEL_FQ void m03800_m08 (KERN_ATTR_BASIC ()) * main */ - m03800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03800_m16 (KERN_ATTR_BASIC ()) @@ -591,7 +591,7 @@ KERNEL_FQ void m03800_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -633,7 +633,7 @@ KERNEL_FQ void m03800_m16 (KERN_ATTR_BASIC ()) * main */ - m03800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) @@ -644,7 +644,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -686,7 +686,7 @@ KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) * main */ - m03800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03800_s08 (KERN_ATTR_BASIC ()) @@ -697,7 +697,7 @@ KERNEL_FQ void m03800_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -739,7 +739,7 @@ KERNEL_FQ void m03800_s08 (KERN_ATTR_BASIC ()) * main */ - m03800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m03800_s16 (KERN_ATTR_BASIC ()) @@ -750,7 +750,7 @@ KERNEL_FQ void m03800_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -792,5 +792,5 @@ KERNEL_FQ void m03800_s16 (KERN_ATTR_BASIC ()) * main */ - m03800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m03800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m03800_a3-pure.cl b/OpenCL/m03800_a3-pure.cl index 4a26acaa9..c98cb5027 100644 --- a/OpenCL/m03800_a3-pure.cl +++ b/OpenCL/m03800_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -59,7 +59,7 @@ KERNEL_FQ void m03800_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -95,7 +95,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -122,20 +122,20 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -143,7 +143,7 @@ KERNEL_FQ void m03800_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl index b9b7c7741..6ed5dd0a6 100644 --- a/OpenCL/m03910_a0-optimized.cl +++ b/OpenCL/m03910_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,14 +84,14 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -105,7 +105,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -423,7 +423,7 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -452,14 +452,14 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -475,17 +475,17 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m03910_a0-pure.cl b/OpenCL/m03910_a0-pure.cl index 96bd71940..e2d0e0218 100644 --- a/OpenCL/m03910_a0-pure.cl +++ b/OpenCL/m03910_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -69,14 +69,14 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_RULES ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -181,7 +181,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -189,10 +189,10 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -207,14 +207,14 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_RULES ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m03910_a1-optimized.cl b/OpenCL/m03910_a1-optimized.cl index c82c512c4..7ece02213 100644 --- a/OpenCL/m03910_a1-optimized.cl +++ b/OpenCL/m03910_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,14 +82,14 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -103,7 +103,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -141,7 +141,7 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -480,7 +480,7 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -509,14 +509,14 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -532,17 +532,17 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -580,7 +580,7 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m03910_a1-pure.cl b/OpenCL/m03910_a1-pure.cl index ed7c8b483..88172f03d 100644 --- a/OpenCL/m03910_a1-pure.cl +++ b/OpenCL/m03910_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -65,7 +65,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_BASIC ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } md5_ctx_t ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -177,7 +177,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -185,10 +185,10 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -201,7 +201,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_BASIC ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } md5_ctx_t ctx0; @@ -214,7 +214,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m03910_a3-optimized.cl b/OpenCL/m03910_a3-optimized.cl index c0af5aa66..67b3395b8 100644 --- a/OpenCL/m03910_a3-optimized.cl +++ b/OpenCL/m03910_a3-optimized.cl @@ -44,14 +44,14 @@ DECLSPEC void m03910m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -67,7 +67,7 @@ DECLSPEC void m03910m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -386,14 +386,14 @@ DECLSPEC void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; salt_buf2[0] = 0; salt_buf2[1] = 0; salt_buf2[2] = 0; @@ -409,10 +409,10 @@ DECLSPEC void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -421,7 +421,7 @@ DECLSPEC void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -786,13 +786,13 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03910m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03910m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03910_m08 (KERN_ATTR_BASIC ()) @@ -856,13 +856,13 @@ KERNEL_FQ void m03910_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03910m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03910m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03910_m16 (KERN_ATTR_BASIC ()) @@ -926,13 +926,13 @@ KERNEL_FQ void m03910_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03910m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03910m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) @@ -996,13 +996,13 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03910s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03910s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03910_s08 (KERN_ATTR_BASIC ()) @@ -1066,13 +1066,13 @@ KERNEL_FQ void m03910_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03910s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03910s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m03910_s16 (KERN_ATTR_BASIC ()) @@ -1136,11 +1136,11 @@ KERNEL_FQ void m03910_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m03910s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m03910s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m03910_a3-pure.cl b/OpenCL/m03910_a3-pure.cl index fa7b14275..5f7e71d69 100644 --- a/OpenCL/m03910_a3-pure.cl +++ b/OpenCL/m03910_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -74,7 +74,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_VECTOR ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m03910_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -190,7 +190,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -198,10 +198,10 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -223,7 +223,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_VECTOR ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf_pc[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]; } /** @@ -232,7 +232,7 @@ KERNEL_FQ void m03910_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04010_a0-optimized.cl b/OpenCL/m04010_a0-optimized.cl index 7b8f1c96e..56657e409 100644 --- a/OpenCL/m04010_a0-optimized.cl +++ b/OpenCL/m04010_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,24 +84,24 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -109,7 +109,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -396,7 +396,7 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -425,24 +425,24 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = 32 + salt_len; @@ -452,17 +452,17 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04010_a0-pure.cl b/OpenCL/m04010_a0-pure.cl index fd7b887d7..649d21083 100644 --- a/OpenCL/m04010_a0-pure.cl +++ b/OpenCL/m04010_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -162,7 +162,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -170,10 +170,10 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,13 +186,13 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04010_a1-optimized.cl b/OpenCL/m04010_a1-optimized.cl index 09e9122af..81d8e7e20 100644 --- a/OpenCL/m04010_a1-optimized.cl +++ b/OpenCL/m04010_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,24 +82,24 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 final_len = salt_len + 32; @@ -107,7 +107,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -145,7 +145,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -452,7 +452,7 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -481,24 +481,24 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 final_len = salt_len + 32; @@ -508,17 +508,17 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -556,7 +556,7 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04010_a1-pure.cl b/OpenCL/m04010_a1-pure.cl index a19e50be7..56e876a35 100644 --- a/OpenCL/m04010_a1-pure.cl +++ b/OpenCL/m04010_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,7 +63,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_ctx_t ctx0t = ctx0; @@ -73,7 +73,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0t; @@ -158,7 +158,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -166,10 +166,10 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -180,7 +180,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_ctx_t ctx0t = ctx0; @@ -190,7 +190,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0t; diff --git a/OpenCL/m04010_a3-optimized.cl b/OpenCL/m04010_a3-optimized.cl index a92825f6e..2f00ec865 100644 --- a/OpenCL/m04010_a3-optimized.cl +++ b/OpenCL/m04010_a3-optimized.cl @@ -44,24 +44,24 @@ DECLSPEC void m04010m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; const u32 final_len = salt_len + 32; @@ -72,7 +72,7 @@ DECLSPEC void m04010m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -350,10 +350,10 @@ DECLSPEC void m04010s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -365,24 +365,24 @@ DECLSPEC void m04010s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; const u32 final_len = salt_len + 32; @@ -393,7 +393,7 @@ DECLSPEC void m04010s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -686,7 +686,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -726,7 +726,7 @@ KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) * main */ - m04010m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04010m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04010_m08 (KERN_ATTR_BASIC ()) @@ -790,13 +790,13 @@ KERNEL_FQ void m04010_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04010m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04010m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04010_m16 (KERN_ATTR_BASIC ()) @@ -860,13 +860,13 @@ KERNEL_FQ void m04010_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04010m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04010m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) @@ -930,13 +930,13 @@ KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04010s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04010s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04010_s08 (KERN_ATTR_BASIC ()) @@ -1000,13 +1000,13 @@ KERNEL_FQ void m04010_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04010s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04010s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04010_s16 (KERN_ATTR_BASIC ()) @@ -1036,7 +1036,7 @@ KERNEL_FQ void m04010_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1076,5 +1076,5 @@ KERNEL_FQ void m04010_s16 (KERN_ATTR_BASIC ()) * main */ - m04010s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04010s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04010_a3-pure.cl b/OpenCL/m04010_a3-pure.cl index bbabba4ac..1164ac168 100644 --- a/OpenCL/m04010_a3-pure.cl +++ b/OpenCL/m04010_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -72,7 +72,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -80,7 +80,7 @@ KERNEL_FQ void m04010_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -175,7 +175,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -183,10 +183,10 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -206,7 +206,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -214,7 +214,7 @@ KERNEL_FQ void m04010_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04110_a0-optimized.cl b/OpenCL/m04110_a0-optimized.cl index 9756a3bee..6ee80f872 100644 --- a/OpenCL/m04110_a0-optimized.cl +++ b/OpenCL/m04110_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,24 +84,24 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 final_len = salt_len + 32; // salt version 2: with 0x80 appended @@ -111,22 +111,22 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_RULES ()) u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; append_0x80_4x4_S (salt_buf0_t, salt_buf1_t, salt_buf2_t, salt_buf3_t, salt_len); @@ -134,7 +134,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -441,7 +441,7 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -470,24 +470,24 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 final_len = salt_len + 32; // salt version 2: with 0x80 appended @@ -497,22 +497,22 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_RULES ()) u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; append_0x80_4x4_S (salt_buf0_t, salt_buf1_t, salt_buf2_t, salt_buf3_t, salt_len); @@ -522,17 +522,17 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04110_a0-pure.cl b/OpenCL/m04110_a0-pure.cl index 217d13dd2..517492a00 100644 --- a/OpenCL/m04110_a0-pure.cl +++ b/OpenCL/m04110_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,13 +63,13 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -82,7 +82,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -175,7 +175,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -183,10 +183,10 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -195,13 +195,13 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -214,7 +214,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04110_a1-optimized.cl b/OpenCL/m04110_a1-optimized.cl index 3c76c9f34..4a8ea112f 100644 --- a/OpenCL/m04110_a1-optimized.cl +++ b/OpenCL/m04110_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,24 +82,24 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 final_len = salt_len + 32; // salt version 2: with 0x80 appended @@ -109,22 +109,22 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; append_0x80_4x4_S (salt_buf0_t, salt_buf1_t, salt_buf2_t, salt_buf3_t, salt_len); @@ -132,7 +132,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -170,7 +170,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -499,7 +499,7 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -528,24 +528,24 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 final_len = salt_len + 32; // salt version 2: with 0x80 appended @@ -555,22 +555,22 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; append_0x80_4x4_S (salt_buf0_t, salt_buf1_t, salt_buf2_t, salt_buf3_t, salt_len); @@ -580,17 +580,17 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -628,7 +628,7 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04110_a1-pure.cl b/OpenCL/m04110_a1-pure.cl index e8537a862..7719f87bf 100644 --- a/OpenCL/m04110_a1-pure.cl +++ b/OpenCL/m04110_a1-pure.cl @@ -53,19 +53,19 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0t; @@ -171,7 +171,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -179,23 +179,23 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -214,7 +214,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0t; diff --git a/OpenCL/m04110_a3-optimized.cl b/OpenCL/m04110_a3-optimized.cl index de008fcf7..8e7ee5115 100644 --- a/OpenCL/m04110_a3-optimized.cl +++ b/OpenCL/m04110_a3-optimized.cl @@ -44,24 +44,24 @@ DECLSPEC void m04110m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; const u32 final_len = salt_len + 32; @@ -119,7 +119,7 @@ DECLSPEC void m04110m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -378,10 +378,10 @@ DECLSPEC void m04110s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -393,24 +393,24 @@ DECLSPEC void m04110s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; const u32 final_len = salt_len + 32; @@ -468,7 +468,7 @@ DECLSPEC void m04110s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -742,7 +742,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -782,7 +782,7 @@ KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) * main */ - m04110m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04110m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04110_m08 (KERN_ATTR_BASIC ()) @@ -846,13 +846,13 @@ KERNEL_FQ void m04110_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04110m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04110m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04110_m16 (KERN_ATTR_BASIC ()) @@ -916,13 +916,13 @@ KERNEL_FQ void m04110_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04110m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04110m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) @@ -986,13 +986,13 @@ KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04110s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04110s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04110_s08 (KERN_ATTR_BASIC ()) @@ -1056,13 +1056,13 @@ KERNEL_FQ void m04110_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04110s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04110s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04110_s16 (KERN_ATTR_BASIC ()) @@ -1092,7 +1092,7 @@ KERNEL_FQ void m04110_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1132,5 +1132,5 @@ KERNEL_FQ void m04110_s16 (KERN_ATTR_BASIC ()) * main */ - m04110s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04110s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04110_a3-pure.cl b/OpenCL/m04110_a3-pure.cl index a2a44b0aa..4a3386daa 100644 --- a/OpenCL/m04110_a3-pure.cl +++ b/OpenCL/m04110_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,20 +68,20 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -89,7 +89,7 @@ KERNEL_FQ void m04110_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -186,7 +186,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -194,10 +194,10 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -213,20 +213,20 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -234,7 +234,7 @@ KERNEL_FQ void m04110_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04310_a0-optimized.cl b/OpenCL/m04310_a0-optimized.cl index 64cee0788..5f44932f2 100644 --- a/OpenCL/m04310_a0-optimized.cl +++ b/OpenCL/m04310_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,12 +84,12 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -101,13 +101,13 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -339,7 +339,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -368,12 +368,12 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -385,7 +385,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_RULES ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -393,17 +393,17 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04310_a0-pure.cl b/OpenCL/m04310_a0-pure.cl index 5e9ef9bdd..8e0515311 100644 --- a/OpenCL/m04310_a0-pure.cl +++ b/OpenCL/m04310_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,20 +63,20 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -158,7 +158,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -166,10 +166,10 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -178,20 +178,20 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04310_a1-optimized.cl b/OpenCL/m04310_a1-optimized.cl index c43370749..83540be4b 100644 --- a/OpenCL/m04310_a1-optimized.cl +++ b/OpenCL/m04310_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,12 +82,12 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -99,13 +99,13 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -396,7 +396,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -425,12 +425,12 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -442,7 +442,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -450,17 +450,17 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -498,7 +498,7 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04310_a1-pure.cl b/OpenCL/m04310_a1-pure.cl index 5da77d325..30da21734 100644 --- a/OpenCL/m04310_a1-pure.cl +++ b/OpenCL/m04310_a1-pure.cl @@ -53,19 +53,19 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -154,7 +154,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -162,23 +162,23 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -191,7 +191,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m04310_a3-optimized.cl b/OpenCL/m04310_a3-optimized.cl index d638fd9d6..f2f2f420e 100644 --- a/OpenCL/m04310_a3-optimized.cl +++ b/OpenCL/m04310_a3-optimized.cl @@ -44,12 +44,12 @@ DECLSPEC void m04310m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -61,7 +61,7 @@ DECLSPEC void m04310m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -69,7 +69,7 @@ DECLSPEC void m04310m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -302,12 +302,12 @@ DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[5]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; salt_buf1[2] = 0; salt_buf1[3] = 0; salt_buf2[0] = 0; @@ -319,7 +319,7 @@ DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -327,10 +327,10 @@ DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -339,7 +339,7 @@ DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -619,13 +619,13 @@ KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04310m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04310m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04310_m08 (KERN_ATTR_BASIC ()) @@ -689,13 +689,13 @@ KERNEL_FQ void m04310_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04310m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04310m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04310_m16 (KERN_ATTR_BASIC ()) @@ -759,13 +759,13 @@ KERNEL_FQ void m04310_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04310m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04310m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) @@ -829,13 +829,13 @@ KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04310s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04310s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04310_s08 (KERN_ATTR_BASIC ()) @@ -899,13 +899,13 @@ KERNEL_FQ void m04310_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04310s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04310s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04310_s16 (KERN_ATTR_BASIC ()) @@ -969,11 +969,11 @@ KERNEL_FQ void m04310_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m04310s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04310s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04310_a3-pure.cl b/OpenCL/m04310_a3-pure.cl index bf97c9321..70899b550 100644 --- a/OpenCL/m04310_a3-pure.cl +++ b/OpenCL/m04310_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,13 +68,13 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m04310_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -167,7 +167,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -194,13 +194,13 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -209,7 +209,7 @@ KERNEL_FQ void m04310_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04400_a0-optimized.cl b/OpenCL/m04400_a0-optimized.cl index 39e3ea662..2b644f5a2 100644 --- a/OpenCL/m04400_a0-optimized.cl +++ b/OpenCL/m04400_a0-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,7 +80,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -366,7 +366,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -392,17 +392,17 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04400_a0-pure.cl b/OpenCL/m04400_a0-pure.cl index ba41beb8a..803e51955 100644 --- a/OpenCL/m04400_a0-pure.cl +++ b/OpenCL/m04400_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,7 +68,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -153,7 +153,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -161,10 +161,10 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -177,7 +177,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04400_a1-optimized.cl b/OpenCL/m04400_a1-optimized.cl index 4c4df8b3a..4f3fbbbdf 100644 --- a/OpenCL/m04400_a1-optimized.cl +++ b/OpenCL/m04400_a1-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -78,7 +78,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -116,7 +116,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -422,7 +422,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -448,17 +448,17 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -496,7 +496,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04400_a1-pure.cl b/OpenCL/m04400_a1-pure.cl index 371a350e6..f45344681 100644 --- a/OpenCL/m04400_a1-pure.cl +++ b/OpenCL/m04400_a1-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -70,7 +70,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; @@ -149,7 +149,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -157,10 +157,10 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -177,7 +177,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m04400_a3-optimized.cl b/OpenCL/m04400_a3-optimized.cl index 37a39783b..f0e01109c 100644 --- a/OpenCL/m04400_a3-optimized.cl +++ b/OpenCL/m04400_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m04400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -303,10 +303,10 @@ DECLSPEC void m04400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -315,7 +315,7 @@ DECLSPEC void m04400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -591,7 +591,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -631,7 +631,7 @@ KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) * main */ - m04400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04400_m08 (KERN_ATTR_BASIC ()) @@ -661,7 +661,7 @@ KERNEL_FQ void m04400_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -701,7 +701,7 @@ KERNEL_FQ void m04400_m08 (KERN_ATTR_BASIC ()) * main */ - m04400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04400_m16 (KERN_ATTR_BASIC ()) @@ -731,7 +731,7 @@ KERNEL_FQ void m04400_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -771,7 +771,7 @@ KERNEL_FQ void m04400_m16 (KERN_ATTR_BASIC ()) * main */ - m04400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) @@ -801,7 +801,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -841,7 +841,7 @@ KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) * main */ - m04400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04400_s08 (KERN_ATTR_BASIC ()) @@ -871,7 +871,7 @@ KERNEL_FQ void m04400_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -911,7 +911,7 @@ KERNEL_FQ void m04400_s08 (KERN_ATTR_BASIC ()) * main */ - m04400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04400_s16 (KERN_ATTR_BASIC ()) @@ -941,7 +941,7 @@ KERNEL_FQ void m04400_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -981,5 +981,5 @@ KERNEL_FQ void m04400_s16 (KERN_ATTR_BASIC ()) * main */ - m04400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04400_a3-pure.cl b/OpenCL/m04400_a3-pure.cl index 049733a00..35e00afd8 100644 --- a/OpenCL/m04400_a3-pure.cl +++ b/OpenCL/m04400_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -75,7 +75,7 @@ KERNEL_FQ void m04400_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -162,7 +162,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -170,10 +170,10 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -195,7 +195,7 @@ KERNEL_FQ void m04400_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04500_a0-optimized.cl b/OpenCL/m04500_a0-optimized.cl index c54d38971..f25040c96 100644 --- a/OpenCL/m04500_a0-optimized.cl +++ b/OpenCL/m04500_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -79,7 +79,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -392,7 +392,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -418,10 +418,10 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -434,7 +434,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04500_a0-pure.cl b/OpenCL/m04500_a0-pure.cl index e4de5e3e5..72df122d2 100644 --- a/OpenCL/m04500_a0-pure.cl +++ b/OpenCL/m04500_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,7 +67,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -152,7 +152,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -160,10 +160,10 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -176,7 +176,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04500_a1-optimized.cl b/OpenCL/m04500_a1-optimized.cl index 75f380bbe..9319efe17 100644 --- a/OpenCL/m04500_a1-optimized.cl +++ b/OpenCL/m04500_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -77,7 +77,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -115,7 +115,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -448,7 +448,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -474,10 +474,10 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -490,7 +490,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -528,7 +528,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04500_a1-pure.cl b/OpenCL/m04500_a1-pure.cl index cab4cee4c..a601a85cd 100644 --- a/OpenCL/m04500_a1-pure.cl +++ b/OpenCL/m04500_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -69,7 +69,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; @@ -148,7 +148,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -156,10 +156,10 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -176,7 +176,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m04500_a3-optimized.cl b/OpenCL/m04500_a3-optimized.cl index c33835c6f..9947c578a 100644 --- a/OpenCL/m04500_a3-optimized.cl +++ b/OpenCL/m04500_a3-optimized.cl @@ -41,7 +41,7 @@ DECLSPEC void m04500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -329,10 +329,10 @@ DECLSPEC void m04500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -347,7 +347,7 @@ DECLSPEC void m04500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -650,7 +650,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -690,7 +690,7 @@ KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) * main */ - m04500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04500_m08 (KERN_ATTR_BASIC ()) @@ -720,7 +720,7 @@ KERNEL_FQ void m04500_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -760,7 +760,7 @@ KERNEL_FQ void m04500_m08 (KERN_ATTR_BASIC ()) * main */ - m04500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04500_m16 (KERN_ATTR_BASIC ()) @@ -790,7 +790,7 @@ KERNEL_FQ void m04500_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -830,7 +830,7 @@ KERNEL_FQ void m04500_m16 (KERN_ATTR_BASIC ()) * main */ - m04500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) @@ -860,7 +860,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -900,7 +900,7 @@ KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) * main */ - m04500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04500_s08 (KERN_ATTR_BASIC ()) @@ -930,7 +930,7 @@ KERNEL_FQ void m04500_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -970,7 +970,7 @@ KERNEL_FQ void m04500_s08 (KERN_ATTR_BASIC ()) * main */ - m04500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04500_s16 (KERN_ATTR_BASIC ()) @@ -1000,7 +1000,7 @@ KERNEL_FQ void m04500_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1040,5 +1040,5 @@ KERNEL_FQ void m04500_s16 (KERN_ATTR_BASIC ()) * main */ - m04500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04500_a3-pure.cl b/OpenCL/m04500_a3-pure.cl index e1ad35a10..ef87c82ca 100644 --- a/OpenCL/m04500_a3-pure.cl +++ b/OpenCL/m04500_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -74,7 +74,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -161,7 +161,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -169,10 +169,10 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -194,7 +194,7 @@ KERNEL_FQ void m04500_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04510_a0-optimized.cl b/OpenCL/m04510_a0-optimized.cl index bbcbb4cef..c387b9421 100644 --- a/OpenCL/m04510_a0-optimized.cl +++ b/OpenCL/m04510_a0-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -84,30 +84,30 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -1053,7 +1053,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -1083,34 +1083,34 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest */ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -1123,7 +1123,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04510_a0-pure.cl b/OpenCL/m04510_a0-pure.cl index 46853da05..994b5060b 100644 --- a/OpenCL/m04510_a0-pure.cl +++ b/OpenCL/m04510_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -63,13 +63,13 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -81,7 +81,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -157,7 +157,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -165,10 +165,10 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_RULES ()) */ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -177,13 +177,13 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -195,7 +195,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04510_a1-optimized.cl b/OpenCL/m04510_a1-optimized.cl index f074fd09c..d7bca692c 100644 --- a/OpenCL/m04510_a1-optimized.cl +++ b/OpenCL/m04510_a1-optimized.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -82,30 +82,30 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -1108,7 +1108,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -1138,34 +1138,34 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest */ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -1178,7 +1178,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -1216,7 +1216,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04510_a1-pure.cl b/OpenCL/m04510_a1-pure.cl index 048061ec2..d2c2698de 100644 --- a/OpenCL/m04510_a1-pure.cl +++ b/OpenCL/m04510_a1-pure.cl @@ -52,20 +52,20 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -83,7 +83,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; @@ -153,7 +153,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -161,23 +161,23 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_BASIC ()) */ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -195,7 +195,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m04510_a3-optimized.cl b/OpenCL/m04510_a3-optimized.cl index 2fd64e49a..006250782 100644 --- a/OpenCL/m04510_a3-optimized.cl +++ b/OpenCL/m04510_a3-optimized.cl @@ -44,24 +44,24 @@ DECLSPEC void m04510m (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -69,7 +69,7 @@ DECLSPEC void m04510m (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, u32 w0l = w0[0]; - 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); @@ -994,34 +994,34 @@ DECLSPEC void m04510s (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest */ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -1036,7 +1036,7 @@ DECLSPEC void m04510s (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, u32 w0l = w0[0]; - 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); @@ -1975,7 +1975,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -2016,7 +2016,7 @@ KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) * main */ - m04510m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04510m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04510_m08 (KERN_ATTR_BASIC ()) @@ -2045,7 +2045,7 @@ KERNEL_FQ void m04510_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -2086,7 +2086,7 @@ KERNEL_FQ void m04510_m08 (KERN_ATTR_BASIC ()) * main */ - m04510m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04510m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04510_m16 (KERN_ATTR_BASIC ()) @@ -2115,7 +2115,7 @@ KERNEL_FQ void m04510_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -2156,7 +2156,7 @@ KERNEL_FQ void m04510_m16 (KERN_ATTR_BASIC ()) * main */ - m04510m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04510m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) @@ -2185,7 +2185,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -2226,7 +2226,7 @@ KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) * main */ - m04510s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04510s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04510_s08 (KERN_ATTR_BASIC ()) @@ -2255,7 +2255,7 @@ KERNEL_FQ void m04510_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -2296,7 +2296,7 @@ KERNEL_FQ void m04510_s08 (KERN_ATTR_BASIC ()) * main */ - m04510s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04510s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04510_s16 (KERN_ATTR_BASIC ()) @@ -2325,7 +2325,7 @@ KERNEL_FQ void m04510_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -2366,5 +2366,5 @@ KERNEL_FQ void m04510_s16 (KERN_ATTR_BASIC ()) * main */ - m04510s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04510s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04510_a3-pure.cl b/OpenCL/m04510_a3-pure.cl index 54acf026b..ec33ab924 100644 --- a/OpenCL/m04510_a3-pure.cl +++ b/OpenCL/m04510_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -68,13 +68,13 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -83,7 +83,7 @@ KERNEL_FQ void m04510_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -161,7 +161,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) + if (gid >= GID_MAX) return; /** @@ -169,10 +169,10 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_VECTOR ()) */ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -188,13 +188,13 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -208,7 +208,7 @@ KERNEL_FQ void m04510_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04520_a0-optimized.cl b/OpenCL/m04520_a0-optimized.cl index 06fa20da3..11f921190 100644 --- a/OpenCL/m04520_a0-optimized.cl +++ b/OpenCL/m04520_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,30 +84,30 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -623,7 +623,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -652,24 +652,24 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -677,17 +677,17 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04520_a0-pure.cl b/OpenCL/m04520_a0-pure.cl index dfb94bce1..feb561587 100644 --- a/OpenCL/m04520_a0-pure.cl +++ b/OpenCL/m04520_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -167,7 +167,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -191,13 +191,13 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04520_a1-optimized.cl b/OpenCL/m04520_a1-optimized.cl index db348f706..3b3e3be73 100644 --- a/OpenCL/m04520_a1-optimized.cl +++ b/OpenCL/m04520_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,30 +82,30 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -679,7 +679,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -708,24 +708,24 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -733,17 +733,17 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -781,7 +781,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04520_a1-pure.cl b/OpenCL/m04520_a1-pure.cl index a4ebaed1c..94bf96a5b 100644 --- a/OpenCL/m04520_a1-pure.cl +++ b/OpenCL/m04520_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,7 +63,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -75,7 +75,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; @@ -163,7 +163,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -171,10 +171,10 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -185,7 +185,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -197,7 +197,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; diff --git a/OpenCL/m04520_a3-optimized.cl b/OpenCL/m04520_a3-optimized.cl index a5015e054..2151d90e7 100644 --- a/OpenCL/m04520_a3-optimized.cl +++ b/OpenCL/m04520_a3-optimized.cl @@ -44,24 +44,24 @@ DECLSPEC void m04520m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -69,7 +69,7 @@ DECLSPEC void m04520m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -563,24 +563,24 @@ DECLSPEC void m04520s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -588,10 +588,10 @@ DECLSPEC void m04520s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -600,7 +600,7 @@ DECLSPEC void m04520s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -1103,7 +1103,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1143,7 +1143,7 @@ KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) * main */ - m04520m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04520m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04520_m08 (KERN_ATTR_BASIC ()) @@ -1173,7 +1173,7 @@ KERNEL_FQ void m04520_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1213,7 +1213,7 @@ KERNEL_FQ void m04520_m08 (KERN_ATTR_BASIC ()) * main */ - m04520m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04520m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04520_m16 (KERN_ATTR_BASIC ()) @@ -1243,7 +1243,7 @@ KERNEL_FQ void m04520_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1283,7 +1283,7 @@ KERNEL_FQ void m04520_m16 (KERN_ATTR_BASIC ()) * main */ - m04520m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04520m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) @@ -1313,7 +1313,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1353,7 +1353,7 @@ KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) * main */ - m04520s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04520s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04520_s08 (KERN_ATTR_BASIC ()) @@ -1383,7 +1383,7 @@ KERNEL_FQ void m04520_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1423,7 +1423,7 @@ KERNEL_FQ void m04520_s08 (KERN_ATTR_BASIC ()) * main */ - m04520s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04520s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04520_s16 (KERN_ATTR_BASIC ()) @@ -1453,7 +1453,7 @@ KERNEL_FQ void m04520_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1493,5 +1493,5 @@ KERNEL_FQ void m04520_s16 (KERN_ATTR_BASIC ()) * main */ - m04520s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04520s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04520_a3-pure.cl b/OpenCL/m04520_a3-pure.cl index b5e43b0c4..05ebc0af9 100644 --- a/OpenCL/m04520_a3-pure.cl +++ b/OpenCL/m04520_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -72,7 +72,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -80,7 +80,7 @@ KERNEL_FQ void m04520_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -178,7 +178,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -186,10 +186,10 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -209,7 +209,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -217,7 +217,7 @@ KERNEL_FQ void m04520_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04700_a0-optimized.cl b/OpenCL/m04700_a0-optimized.cl index 11f784fb8..f37a813f9 100644 --- a/OpenCL/m04700_a0-optimized.cl +++ b/OpenCL/m04700_a0-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,7 +80,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -349,7 +349,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -375,10 +375,10 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -391,7 +391,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04700_a0-pure.cl b/OpenCL/m04700_a0-pure.cl index 6a505bdb5..7cb3d8fc3 100644 --- a/OpenCL/m04700_a0-pure.cl +++ b/OpenCL/m04700_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,7 +68,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -148,7 +148,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -156,10 +156,10 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -172,7 +172,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04700_a1-optimized.cl b/OpenCL/m04700_a1-optimized.cl index d72cbfb3e..44522c2ec 100644 --- a/OpenCL/m04700_a1-optimized.cl +++ b/OpenCL/m04700_a1-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -78,7 +78,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -116,7 +116,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -402,7 +402,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -428,10 +428,10 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -444,7 +444,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -482,7 +482,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04700_a1-pure.cl b/OpenCL/m04700_a1-pure.cl index efb39f2d6..c5e35321d 100644 --- a/OpenCL/m04700_a1-pure.cl +++ b/OpenCL/m04700_a1-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -70,7 +70,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -144,7 +144,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -152,10 +152,10 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -172,7 +172,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m04700_a3-optimized.cl b/OpenCL/m04700_a3-optimized.cl index db37ac820..84344618d 100644 --- a/OpenCL/m04700_a3-optimized.cl +++ b/OpenCL/m04700_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m04700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -300,10 +300,10 @@ DECLSPEC void m04700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -318,7 +318,7 @@ DECLSPEC void m04700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -591,7 +591,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -631,7 +631,7 @@ KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) * main */ - m04700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04700_m08 (KERN_ATTR_BASIC ()) @@ -661,7 +661,7 @@ KERNEL_FQ void m04700_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -701,7 +701,7 @@ KERNEL_FQ void m04700_m08 (KERN_ATTR_BASIC ()) * main */ - m04700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04700_m16 (KERN_ATTR_BASIC ()) @@ -731,7 +731,7 @@ KERNEL_FQ void m04700_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -771,7 +771,7 @@ KERNEL_FQ void m04700_m16 (KERN_ATTR_BASIC ()) * main */ - m04700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) @@ -801,7 +801,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -841,7 +841,7 @@ KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) * main */ - m04700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04700_s08 (KERN_ATTR_BASIC ()) @@ -871,7 +871,7 @@ KERNEL_FQ void m04700_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -911,7 +911,7 @@ KERNEL_FQ void m04700_s08 (KERN_ATTR_BASIC ()) * main */ - m04700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04700_s16 (KERN_ATTR_BASIC ()) @@ -941,7 +941,7 @@ KERNEL_FQ void m04700_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -981,5 +981,5 @@ KERNEL_FQ void m04700_s16 (KERN_ATTR_BASIC ()) * main */ - m04700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04700_a3-pure.cl b/OpenCL/m04700_a3-pure.cl index 943be5a92..1a7151647 100644 --- a/OpenCL/m04700_a3-pure.cl +++ b/OpenCL/m04700_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -75,7 +75,7 @@ KERNEL_FQ void m04700_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -157,7 +157,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -165,10 +165,10 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -190,7 +190,7 @@ KERNEL_FQ void m04700_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04710_a0-optimized.cl b/OpenCL/m04710_a0-optimized.cl index d97c8c208..be2dfe12f 100644 --- a/OpenCL/m04710_a0-optimized.cl +++ b/OpenCL/m04710_a0-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -85,30 +85,30 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -754,7 +754,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -783,24 +783,24 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -808,10 +808,10 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -824,7 +824,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04710_a0-pure.cl b/OpenCL/m04710_a0-pure.cl index 95f324751..fb48d6758 100644 --- a/OpenCL/m04710_a0-pure.cl +++ b/OpenCL/m04710_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -64,13 +64,13 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -82,7 +82,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -173,7 +173,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -181,10 +181,10 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -193,13 +193,13 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -211,7 +211,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04710_a1-optimized.cl b/OpenCL/m04710_a1-optimized.cl index adc63acc7..bfd4e5d8a 100644 --- a/OpenCL/m04710_a1-optimized.cl +++ b/OpenCL/m04710_a1-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -83,30 +83,30 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -144,7 +144,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -807,7 +807,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -836,24 +836,24 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -861,10 +861,10 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -877,7 +877,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -915,7 +915,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04710_a1-pure.cl b/OpenCL/m04710_a1-pure.cl index 4db460c25..ce002933d 100644 --- a/OpenCL/m04710_a1-pure.cl +++ b/OpenCL/m04710_a1-pure.cl @@ -54,19 +54,19 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } md5_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -169,7 +169,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -177,23 +177,23 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } md5_ctx_t ctx0; @@ -211,7 +211,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m04710_a3-optimized.cl b/OpenCL/m04710_a3-optimized.cl index 767f2a2ce..b16dc00f1 100644 --- a/OpenCL/m04710_a3-optimized.cl +++ b/OpenCL/m04710_a3-optimized.cl @@ -45,24 +45,24 @@ DECLSPEC void m04710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -70,7 +70,7 @@ DECLSPEC void m04710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -708,24 +708,24 @@ DECLSPEC void m04710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -733,10 +733,10 @@ DECLSPEC void m04710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -751,7 +751,7 @@ DECLSPEC void m04710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -1401,7 +1401,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1441,7 +1441,7 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) * main */ - m04710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04710_m08 (KERN_ATTR_BASIC ()) @@ -1471,7 +1471,7 @@ KERNEL_FQ void m04710_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1511,7 +1511,7 @@ KERNEL_FQ void m04710_m08 (KERN_ATTR_BASIC ()) * main */ - m04710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04710_m16 (KERN_ATTR_BASIC ()) @@ -1541,7 +1541,7 @@ KERNEL_FQ void m04710_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1581,7 +1581,7 @@ KERNEL_FQ void m04710_m16 (KERN_ATTR_BASIC ()) * main */ - m04710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04710m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) @@ -1611,7 +1611,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1651,7 +1651,7 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) * main */ - m04710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04710_s08 (KERN_ATTR_BASIC ()) @@ -1681,7 +1681,7 @@ KERNEL_FQ void m04710_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1721,7 +1721,7 @@ KERNEL_FQ void m04710_s08 (KERN_ATTR_BASIC ()) * main */ - m04710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m04710_s16 (KERN_ATTR_BASIC ()) @@ -1751,7 +1751,7 @@ KERNEL_FQ void m04710_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1791,5 +1791,5 @@ KERNEL_FQ void m04710_s16 (KERN_ATTR_BASIC ()) * main */ - m04710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m04710s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m04710_a3-pure.cl b/OpenCL/m04710_a3-pure.cl index ab776db6a..0711a5bad 100644 --- a/OpenCL/m04710_a3-pure.cl +++ b/OpenCL/m04710_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -69,13 +69,13 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -89,7 +89,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -182,7 +182,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -190,10 +190,10 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -209,13 +209,13 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -229,7 +229,7 @@ KERNEL_FQ void m04710_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04800_a0-optimized.cl b/OpenCL/m04800_a0-optimized.cl index d3c417df6..15577e69a 100644 --- a/OpenCL/m04800_a0-optimized.cl +++ b/OpenCL/m04800_a0-optimized.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -51,19 +51,19 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_RULES ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -230,7 +230,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -256,13 +256,13 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_RULES ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -270,17 +270,17 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04800_a0-pure.cl b/OpenCL/m04800_a0-pure.cl index bb4ecc961..b40e911c0 100644 --- a/OpenCL/m04800_a0-pure.cl +++ b/OpenCL/m04800_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 1; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 1; u32 s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; md5_ctx_t ctx0; md5_init (&ctx0); - ctx0.w0[0] = salt_bufs[SALT_POS].salt_buf[4]; + ctx0.w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; ctx0.len = 1; @@ -54,7 +54,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -86,7 +86,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -94,10 +94,10 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -106,20 +106,20 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 1; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 1; u32 s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; md5_ctx_t ctx0; md5_init (&ctx0); - ctx0.w0[0] = salt_bufs[SALT_POS].salt_buf[4]; + ctx0.w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; ctx0.len = 1; @@ -127,7 +127,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04800_a1-optimized.cl b/OpenCL/m04800_a1-optimized.cl index 082796384..c879e280a 100644 --- a/OpenCL/m04800_a1-optimized.cl +++ b/OpenCL/m04800_a1-optimized.cl @@ -35,7 +35,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -61,19 +61,19 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -113,7 +113,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -300,7 +300,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -326,13 +326,13 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -340,17 +340,17 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -390,7 +390,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04800_a1-pure.cl b/OpenCL/m04800_a1-pure.cl index 1e7f9fd93..28e571472 100644 --- a/OpenCL/m04800_a1-pure.cl +++ b/OpenCL/m04800_a1-pure.cl @@ -23,26 +23,26 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 1; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 1; u32 s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; md5_ctx_t ctx0; md5_init (&ctx0); - ctx0.w0[0] = salt_bufs[SALT_POS].salt_buf[4]; + ctx0.w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; ctx0.len = 1; @@ -52,7 +52,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -80,7 +80,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,30 +88,30 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 1; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 1; u32 s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; md5_ctx_t ctx0; md5_init (&ctx0); - ctx0.w0[0] = salt_bufs[SALT_POS].salt_buf[4]; + ctx0.w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; ctx0.len = 1; @@ -121,7 +121,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m04800_a3-optimized.cl b/OpenCL/m04800_a3-optimized.cl index 70ab9aded..7c10bd525 100644 --- a/OpenCL/m04800_a3-optimized.cl +++ b/OpenCL/m04800_a3-optimized.cl @@ -29,13 +29,13 @@ DECLSPEC void m04800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -94,7 +94,7 @@ DECLSPEC void m04800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * loop */ - 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); @@ -213,13 +213,13 @@ DECLSPEC void m04800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -280,17 +280,17 @@ DECLSPEC void m04800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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); @@ -405,7 +405,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -447,7 +447,7 @@ KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) * main */ - m04800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04800_m08 (KERN_ATTR_BASIC ()) @@ -458,7 +458,7 @@ KERNEL_FQ void m04800_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -500,7 +500,7 @@ KERNEL_FQ void m04800_m08 (KERN_ATTR_BASIC ()) * main */ - m04800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04800_m16 (KERN_ATTR_BASIC ()) @@ -511,7 +511,7 @@ KERNEL_FQ void m04800_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -553,7 +553,7 @@ KERNEL_FQ void m04800_m16 (KERN_ATTR_BASIC ()) * main */ - m04800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) @@ -564,7 +564,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -606,7 +606,7 @@ KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) * main */ - m04800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04800_s08 (KERN_ATTR_BASIC ()) @@ -617,7 +617,7 @@ KERNEL_FQ void m04800_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -659,7 +659,7 @@ KERNEL_FQ void m04800_s08 (KERN_ATTR_BASIC ()) * main */ - m04800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04800_s16 (KERN_ATTR_BASIC ()) @@ -670,7 +670,7 @@ KERNEL_FQ void m04800_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -712,5 +712,5 @@ KERNEL_FQ void m04800_s16 (KERN_ATTR_BASIC ()) * main */ - m04800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m04800_a3-pure.cl b/OpenCL/m04800_a3-pure.cl index 2d942d46f..8faa2c030 100644 --- a/OpenCL/m04800_a3-pure.cl +++ b/OpenCL/m04800_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 1; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 1; u32x s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; md5_ctx_t ctx0; md5_init (&ctx0); - ctx0.w0[0] = salt_bufs[SALT_POS].salt_buf[4]; + ctx0.w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; ctx0.len = 1; @@ -61,7 +61,7 @@ KERNEL_FQ void m04800_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -97,7 +97,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -105,10 +105,10 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -124,20 +124,20 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 1; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 1; u32x s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; md5_ctx_t ctx0; md5_init (&ctx0); - ctx0.w0[0] = salt_bufs[SALT_POS].salt_buf[4]; + ctx0.w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; ctx0.len = 1; @@ -147,7 +147,7 @@ KERNEL_FQ void m04800_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m04900_a0-optimized.cl b/OpenCL/m04900_a0-optimized.cl index 08f0ea29d..93e05ba38 100644 --- a/OpenCL/m04900_a0-optimized.cl +++ b/OpenCL/m04900_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -310,7 +310,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -335,24 +335,24 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -360,10 +360,10 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -376,7 +376,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m04900_a0-pure.cl b/OpenCL/m04900_a0-pure.cl index 80c707f88..e51a0949d 100644 --- a/OpenCL/m04900_a0-pure.cl +++ b/OpenCL/m04900_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -52,7 +52,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -84,7 +84,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -104,13 +104,13 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -123,7 +123,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m04900_a1-optimized.cl b/OpenCL/m04900_a1-optimized.cl index 138cdc0fd..7ca08dd1d 100644 --- a/OpenCL/m04900_a1-optimized.cl +++ b/OpenCL/m04900_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -368,7 +368,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -393,24 +393,24 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -418,10 +418,10 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -434,7 +434,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -472,7 +472,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m04900_a1-pure.cl b/OpenCL/m04900_a1-pure.cl index f3b20eb7c..b83699ac4 100644 --- a/OpenCL/m04900_a1-pure.cl +++ b/OpenCL/m04900_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,23 +86,23 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m04900_a3-optimized.cl b/OpenCL/m04900_a3-optimized.cl index 6944cc100..fd2e59de6 100644 --- a/OpenCL/m04900_a3-optimized.cl +++ b/OpenCL/m04900_a3-optimized.cl @@ -32,46 +32,46 @@ DECLSPEC void m04900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -104,7 +104,7 @@ DECLSPEC void m04900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -299,46 +299,46 @@ DECLSPEC void m04900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -371,10 +371,10 @@ DECLSPEC void m04900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -389,7 +389,7 @@ DECLSPEC void m04900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -577,7 +577,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -619,7 +619,7 @@ KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) * main */ - m04900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04900_m08 (KERN_ATTR_BASIC ()) @@ -630,7 +630,7 @@ KERNEL_FQ void m04900_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -672,7 +672,7 @@ KERNEL_FQ void m04900_m08 (KERN_ATTR_BASIC ()) * main */ - m04900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04900_m16 (KERN_ATTR_BASIC ()) @@ -683,7 +683,7 @@ KERNEL_FQ void m04900_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -725,7 +725,7 @@ KERNEL_FQ void m04900_m16 (KERN_ATTR_BASIC ()) * main */ - m04900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) @@ -736,7 +736,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -778,7 +778,7 @@ KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) * main */ - m04900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04900_s08 (KERN_ATTR_BASIC ()) @@ -789,7 +789,7 @@ KERNEL_FQ void m04900_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -831,7 +831,7 @@ KERNEL_FQ void m04900_s08 (KERN_ATTR_BASIC ()) * main */ - m04900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m04900_s16 (KERN_ATTR_BASIC ()) @@ -842,7 +842,7 @@ KERNEL_FQ void m04900_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -884,5 +884,5 @@ KERNEL_FQ void m04900_s16 (KERN_ATTR_BASIC ()) * main */ - m04900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m04900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m04900_a3-pure.cl b/OpenCL/m04900_a3-pure.cl index c702a0800..182101dec 100644 --- a/OpenCL/m04900_a3-pure.cl +++ b/OpenCL/m04900_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -59,7 +59,7 @@ KERNEL_FQ void m04900_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -95,7 +95,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -122,20 +122,20 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -143,7 +143,7 @@ KERNEL_FQ void m04900_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m05000_a0-optimized.cl b/OpenCL/m05000_a0-optimized.cl index 8956f7db7..2f52442ba 100644 --- a/OpenCL/m05000_a0-optimized.cl +++ b/OpenCL/m05000_a0-optimized.cl @@ -60,7 +60,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -85,30 +85,30 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -498,7 +498,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -523,24 +523,24 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -548,10 +548,10 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -564,7 +564,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m05000_a0-pure.cl b/OpenCL/m05000_a0-pure.cl index dfa97da46..6f79c5fea 100644 --- a/OpenCL/m05000_a0-pure.cl +++ b/OpenCL/m05000_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,13 +63,13 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -82,7 +82,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -167,7 +167,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -187,13 +187,13 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -206,7 +206,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m05000_a1-optimized.cl b/OpenCL/m05000_a1-optimized.cl index ce43c1d9c..d5dc51066 100644 --- a/OpenCL/m05000_a1-optimized.cl +++ b/OpenCL/m05000_a1-optimized.cl @@ -58,7 +58,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -83,30 +83,30 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -144,7 +144,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -556,7 +556,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -581,24 +581,24 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -606,10 +606,10 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -622,7 +622,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -660,7 +660,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m05000_a1-pure.cl b/OpenCL/m05000_a1-pure.cl index b5961a063..738022a94 100644 --- a/OpenCL/m05000_a1-pure.cl +++ b/OpenCL/m05000_a1-pure.cl @@ -53,19 +53,19 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -80,7 +80,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -161,7 +161,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -169,23 +169,23 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -200,7 +200,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m05000_a3-optimized.cl b/OpenCL/m05000_a3-optimized.cl index 6ea158860..183ad0ca5 100644 --- a/OpenCL/m05000_a3-optimized.cl +++ b/OpenCL/m05000_a3-optimized.cl @@ -44,46 +44,46 @@ DECLSPEC void m05000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -116,7 +116,7 @@ DECLSPEC void m05000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -451,46 +451,46 @@ DECLSPEC void m05000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -523,10 +523,10 @@ DECLSPEC void m05000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -541,7 +541,7 @@ DECLSPEC void m05000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -888,7 +888,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -924,7 +924,7 @@ KERNEL_FQ void m05000_m04 (KERN_ATTR_BASIC ()) * main */ - m05000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m05000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m05000_m08 (KERN_ATTR_BASIC ()) @@ -954,7 +954,7 @@ KERNEL_FQ void m05000_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -990,7 +990,7 @@ KERNEL_FQ void m05000_m08 (KERN_ATTR_BASIC ()) * main */ - m05000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m05000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m05000_m16 (KERN_ATTR_BASIC ()) @@ -1020,7 +1020,7 @@ KERNEL_FQ void m05000_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1056,7 +1056,7 @@ KERNEL_FQ void m05000_m16 (KERN_ATTR_BASIC ()) * main */ - m05000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m05000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) @@ -1087,7 +1087,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1123,7 +1123,7 @@ KERNEL_FQ void m05000_s04 (KERN_ATTR_BASIC ()) * main */ - m05000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m05000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m05000_s08 (KERN_ATTR_BASIC ()) @@ -1153,7 +1153,7 @@ KERNEL_FQ void m05000_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1189,7 +1189,7 @@ KERNEL_FQ void m05000_s08 (KERN_ATTR_BASIC ()) * main */ - m05000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m05000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m05000_s16 (KERN_ATTR_BASIC ()) @@ -1219,7 +1219,7 @@ KERNEL_FQ void m05000_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1255,5 +1255,5 @@ KERNEL_FQ void m05000_s16 (KERN_ATTR_BASIC ()) * main */ - m05000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m05000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m05000_a3-pure.cl b/OpenCL/m05000_a3-pure.cl index 8e020e7c0..80c163638 100644 --- a/OpenCL/m05000_a3-pure.cl +++ b/OpenCL/m05000_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,20 +68,20 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -89,7 +89,7 @@ KERNEL_FQ void m05000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -178,7 +178,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -186,10 +186,10 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -205,20 +205,20 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -226,7 +226,7 @@ KERNEL_FQ void m05000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m05100_a0-optimized.cl b/OpenCL/m05100_a0-optimized.cl index c040ccf62..305948596 100644 --- a/OpenCL/m05100_a0-optimized.cl +++ b/OpenCL/m05100_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -178,7 +178,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -200,8 +200,8 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -210,7 +210,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m05100_a0-pure.cl b/OpenCL/m05100_a0-pure.cl index ad911801b..7b5cfc668 100644 --- a/OpenCL/m05100_a0-pure.cl +++ b/OpenCL/m05100_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,8 +81,8 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -97,7 +97,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m05100_a1-optimized.cl b/OpenCL/m05100_a1-optimized.cl index 4cf2ff369..6eb45fb88 100644 --- a/OpenCL/m05100_a1-optimized.cl +++ b/OpenCL/m05100_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -231,7 +231,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -253,8 +253,8 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -263,7 +263,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -301,7 +301,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m05100_a1-pure.cl b/OpenCL/m05100_a1-pure.cl index 9153c8162..0aba34173 100644 --- a/OpenCL/m05100_a1-pure.cl +++ b/OpenCL/m05100_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -69,7 +69,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,8 +77,8 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -97,7 +97,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m05100_a3-optimized.cl b/OpenCL/m05100_a3-optimized.cl index 46936de70..5e48cbb8f 100644 --- a/OpenCL/m05100_a3-optimized.cl +++ b/OpenCL/m05100_a3-optimized.cl @@ -29,7 +29,7 @@ DECLSPEC void m05100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -164,8 +164,8 @@ DECLSPEC void m05100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -176,7 +176,7 @@ DECLSPEC void m05100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -304,7 +304,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -340,7 +340,7 @@ KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) * main */ - m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05100_m08 (KERN_ATTR_BASIC ()) @@ -351,7 +351,7 @@ KERNEL_FQ void m05100_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -387,7 +387,7 @@ KERNEL_FQ void m05100_m08 (KERN_ATTR_BASIC ()) * main */ - m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05100_m16 (KERN_ATTR_BASIC ()) @@ -398,7 +398,7 @@ KERNEL_FQ void m05100_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -434,7 +434,7 @@ KERNEL_FQ void m05100_m16 (KERN_ATTR_BASIC ()) * main */ - m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) @@ -445,7 +445,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -481,7 +481,7 @@ KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) * main */ - m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05100_s08 (KERN_ATTR_BASIC ()) @@ -492,7 +492,7 @@ KERNEL_FQ void m05100_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -528,7 +528,7 @@ KERNEL_FQ void m05100_s08 (KERN_ATTR_BASIC ()) * main */ - m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05100_s16 (KERN_ATTR_BASIC ()) @@ -539,7 +539,7 @@ KERNEL_FQ void m05100_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -575,5 +575,5 @@ KERNEL_FQ void m05100_s16 (KERN_ATTR_BASIC ()) * main */ - m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m05100_a3-pure.cl b/OpenCL/m05100_a3-pure.cl index deb53ab42..fa0433dea 100644 --- a/OpenCL/m05100_a3-pure.cl +++ b/OpenCL/m05100_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m05100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -82,7 +82,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -90,8 +90,8 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -115,7 +115,7 @@ KERNEL_FQ void m05100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m05200-pure.cl b/OpenCL/m05200-pure.cl index 59729f2e2..5e17c6d0c 100644 --- a/OpenCL/m05200-pure.cl +++ b/OpenCL/m05200-pure.cl @@ -31,7 +31,7 @@ KERNEL_FQ void m05200_init (KERN_ATTR_TMPS (pwsafe3_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t ctx; @@ -39,7 +39,7 @@ KERNEL_FQ void m05200_init (KERN_ATTR_TMPS (pwsafe3_tmp_t)) sha256_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); - sha256_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_final (&ctx); @@ -57,7 +57,7 @@ KERNEL_FQ void m05200_loop (KERN_ATTR_TMPS (pwsafe3_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x digest[8]; @@ -74,7 +74,7 @@ KERNEL_FQ void m05200_loop (KERN_ATTR_TMPS (pwsafe3_tmp_t)) * init */ - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { u32x w0[4]; u32x w1[4]; @@ -128,7 +128,7 @@ KERNEL_FQ void m05200_comp (KERN_ATTR_TMPS (pwsafe3_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m05300_a0-optimized.cl b/OpenCL/m05300_a0-optimized.cl index 926197bcf..774f2338c 100644 --- a/OpenCL/m05300_a0-optimized.cl +++ b/OpenCL/m05300_a0-optimized.cl @@ -129,19 +129,19 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -165,14 +165,14 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -304,19 +304,19 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -340,8 +340,8 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * digest @@ -349,17 +349,17 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m05300_a0-pure.cl b/OpenCL/m05300_a0-pure.cl index 738f9ed4d..9bc28b1d2 100644 --- a/OpenCL/m05300_a0-pure.cl +++ b/OpenCL/m05300_a0-pure.cl @@ -35,7 +35,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -47,7 +47,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -57,7 +57,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) md5_hmac_init (&ctx0, tmp.i, tmp.pw_len); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); md5_hmac_final (&ctx0); @@ -87,7 +87,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); md5_hmac_final (&ctx); @@ -109,7 +109,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -117,10 +117,10 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -133,7 +133,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -143,7 +143,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) md5_hmac_init (&ctx0, tmp.i, tmp.pw_len); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); md5_hmac_final (&ctx0); @@ -173,7 +173,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); md5_hmac_final (&ctx); diff --git a/OpenCL/m05300_a1-optimized.cl b/OpenCL/m05300_a1-optimized.cl index 8b301f010..f04482cb0 100644 --- a/OpenCL/m05300_a1-optimized.cl +++ b/OpenCL/m05300_a1-optimized.cl @@ -127,19 +127,19 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -163,14 +163,14 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -208,7 +208,7 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -362,19 +362,19 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -398,8 +398,8 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * digest @@ -407,17 +407,17 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -455,7 +455,7 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m05300_a1-pure.cl b/OpenCL/m05300_a1-pure.cl index 2865649a5..c2dbb29d6 100644 --- a/OpenCL/m05300_a1-pure.cl +++ b/OpenCL/m05300_a1-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -52,7 +52,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -80,7 +80,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) md5_hmac_init (&ctx0, c, pw_len + comb_len); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); md5_hmac_final (&ctx0); @@ -110,7 +110,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); md5_hmac_final (&ctx); @@ -132,7 +132,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -140,10 +140,10 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -163,7 +163,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -191,7 +191,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) md5_hmac_init (&ctx0, c, pw_len + comb_len); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); md5_hmac_final (&ctx0); @@ -221,7 +221,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); md5_hmac_final (&ctx); diff --git a/OpenCL/m05300_a3-optimized.cl b/OpenCL/m05300_a3-optimized.cl index 6ffe822bd..084aaceb2 100644 --- a/OpenCL/m05300_a3-optimized.cl +++ b/OpenCL/m05300_a3-optimized.cl @@ -122,8 +122,8 @@ DECLSPEC void m05300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * loop @@ -131,7 +131,7 @@ DECLSPEC void m05300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -269,8 +269,8 @@ DECLSPEC void m05300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * digest @@ -278,10 +278,10 @@ DECLSPEC void m05300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -290,7 +290,7 @@ DECLSPEC void m05300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -433,19 +433,19 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -485,7 +485,7 @@ KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) @@ -506,19 +506,19 @@ KERNEL_FQ void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -558,7 +558,7 @@ KERNEL_FQ void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) @@ -579,19 +579,19 @@ KERNEL_FQ void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -631,7 +631,7 @@ KERNEL_FQ void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) @@ -652,19 +652,19 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -704,7 +704,7 @@ KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) @@ -725,19 +725,19 @@ KERNEL_FQ void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -777,7 +777,7 @@ KERNEL_FQ void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) @@ -798,19 +798,19 @@ KERNEL_FQ void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET].nr_buf[i]; + s_nr_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]; } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET].msg_buf[i]; + s_msg_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -850,5 +850,5 @@ KERNEL_FQ void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } diff --git a/OpenCL/m05300_a3-pure.cl b/OpenCL/m05300_a3-pure.cl index d32b8fce7..189630bf0 100644 --- a/OpenCL/m05300_a3-pure.cl +++ b/OpenCL/m05300_a3-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -54,7 +54,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -66,7 +66,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) md5_hmac_init (&ctx0, w, pw_len); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); md5_hmac_final (&ctx0); @@ -96,7 +96,7 @@ KERNEL_FQ void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); md5_hmac_final (&ctx); @@ -118,7 +118,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -126,10 +126,10 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -151,7 +151,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -163,7 +163,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) md5_hmac_init (&ctx0, w, pw_len); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); md5_hmac_final (&ctx0); @@ -193,7 +193,7 @@ KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); md5_hmac_final (&ctx); diff --git a/OpenCL/m05400_a0-optimized.cl b/OpenCL/m05400_a0-optimized.cl index f75e22fd6..1c74982df 100644 --- a/OpenCL/m05400_a0-optimized.cl +++ b/OpenCL/m05400_a0-optimized.cl @@ -133,19 +133,19 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -169,14 +169,14 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -317,19 +317,19 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -353,8 +353,8 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * digest @@ -362,17 +362,17 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m05400_a0-pure.cl b/OpenCL/m05400_a0-pure.cl index be69544c2..ea8a48179 100644 --- a/OpenCL/m05400_a0-pure.cl +++ b/OpenCL/m05400_a0-pure.cl @@ -35,7 +35,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -47,7 +47,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -57,7 +57,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) sha1_hmac_init_swap (&ctx0, tmp.i, tmp.pw_len); - sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); sha1_hmac_final (&ctx0); @@ -87,7 +87,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); sha1_hmac_final (&ctx); @@ -109,7 +109,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -117,10 +117,10 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -133,7 +133,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -143,7 +143,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) sha1_hmac_init_swap (&ctx0, tmp.i, tmp.pw_len); - sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); sha1_hmac_final (&ctx0); @@ -173,7 +173,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); sha1_hmac_final (&ctx); diff --git a/OpenCL/m05400_a1-optimized.cl b/OpenCL/m05400_a1-optimized.cl index 41134867f..17c644cc8 100644 --- a/OpenCL/m05400_a1-optimized.cl +++ b/OpenCL/m05400_a1-optimized.cl @@ -131,19 +131,19 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -167,14 +167,14 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -212,7 +212,7 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -383,19 +383,19 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -419,8 +419,8 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * digest @@ -428,17 +428,17 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -476,7 +476,7 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m05400_a1-pure.cl b/OpenCL/m05400_a1-pure.cl index 5dbc18d5d..8bd1044a1 100644 --- a/OpenCL/m05400_a1-pure.cl +++ b/OpenCL/m05400_a1-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -52,7 +52,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -80,7 +80,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) sha1_hmac_init (&ctx0, c, pw_len + comb_len); - sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); sha1_hmac_final (&ctx0); @@ -110,7 +110,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); sha1_hmac_final (&ctx); @@ -132,7 +132,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -140,10 +140,10 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -163,7 +163,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -191,7 +191,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) sha1_hmac_init (&ctx0, c, pw_len + comb_len); - sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); sha1_hmac_final (&ctx0); @@ -221,7 +221,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); sha1_hmac_final (&ctx); diff --git a/OpenCL/m05400_a3-optimized.cl b/OpenCL/m05400_a3-optimized.cl index 52b14244c..3ca1d20bd 100644 --- a/OpenCL/m05400_a3-optimized.cl +++ b/OpenCL/m05400_a3-optimized.cl @@ -126,8 +126,8 @@ DECLSPEC void m05400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * loop @@ -135,7 +135,7 @@ DECLSPEC void m05400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -273,8 +273,8 @@ DECLSPEC void m05400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 nr_len = esalt_bufs[DIGESTS_OFFSET].nr_len; - const u32 msg_len = esalt_bufs[DIGESTS_OFFSET].msg_len[5]; + const u32 nr_len = esalt_bufs[DIGESTS_OFFSET_HOST].nr_len; + const u32 msg_len = esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]; /** * digest @@ -282,10 +282,10 @@ DECLSPEC void m05400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -294,7 +294,7 @@ DECLSPEC void m05400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -437,19 +437,19 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -489,7 +489,7 @@ KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) @@ -510,19 +510,19 @@ KERNEL_FQ void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -562,7 +562,7 @@ KERNEL_FQ void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) @@ -583,19 +583,19 @@ KERNEL_FQ void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -635,7 +635,7 @@ KERNEL_FQ void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) @@ -656,19 +656,19 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -708,7 +708,7 @@ KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) @@ -729,19 +729,19 @@ KERNEL_FQ void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -781,7 +781,7 @@ KERNEL_FQ void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } KERNEL_FQ void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) @@ -802,19 +802,19 @@ KERNEL_FQ void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) for (u32 i = lid; i < 16; i += lsz) { - s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].nr_buf[i]); + s_nr_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf[i]); } LOCAL_VK u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { - s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].msg_buf[i]); + s_msg_buf[i] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf[i]); } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -854,5 +854,5 @@ KERNEL_FQ void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) * main */ - m05400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_msg_buf, s_nr_buf); + m05400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_msg_buf, s_nr_buf); } diff --git a/OpenCL/m05400_a3-pure.cl b/OpenCL/m05400_a3-pure.cl index f00dc0131..dc74c5a7f 100644 --- a/OpenCL/m05400_a3-pure.cl +++ b/OpenCL/m05400_a3-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -54,7 +54,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -66,7 +66,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) sha1_hmac_init (&ctx0, w, pw_len); - sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); sha1_hmac_final (&ctx0); @@ -96,7 +96,7 @@ KERNEL_FQ void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); sha1_hmac_final (&ctx); @@ -118,7 +118,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -126,10 +126,10 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -151,7 +151,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -163,7 +163,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) sha1_hmac_init (&ctx0, w, pw_len); - sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].nr_buf, esalt_bufs[DIGESTS_OFFSET].nr_len); + sha1_hmac_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].nr_buf, esalt_bufs[DIGESTS_OFFSET_HOST].nr_len); sha1_hmac_final (&ctx0); @@ -193,7 +193,7 @@ KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].msg_buf, esalt_bufs[DIGESTS_OFFSET].msg_len[5]); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].msg_buf, esalt_bufs[DIGESTS_OFFSET_HOST].msg_len[5]); sha1_hmac_final (&ctx); diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl index 544accf22..205aa4a63 100644 --- a/OpenCL/m05500_a0-optimized.cl +++ b/OpenCL/m05500_a0-optimized.cl @@ -551,7 +551,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -575,9 +575,9 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; u32 data[2]; @@ -588,7 +588,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -773,7 +773,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -797,9 +797,9 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * digest @@ -807,17 +807,17 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m05500_a0-pure.cl b/OpenCL/m05500_a0-pure.cl index a42e6a468..3833ad1c3 100644 --- a/OpenCL/m05500_a0-pure.cl +++ b/OpenCL/m05500_a0-pure.cl @@ -551,15 +551,15 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * base @@ -571,7 +571,7 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -684,7 +684,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -692,19 +692,19 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * base @@ -716,7 +716,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m05500_a1-optimized.cl b/OpenCL/m05500_a1-optimized.cl index 0a720cb9e..6eb4e300c 100644 --- a/OpenCL/m05500_a1-optimized.cl +++ b/OpenCL/m05500_a1-optimized.cl @@ -549,7 +549,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -573,15 +573,15 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -619,7 +619,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -824,7 +824,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -848,9 +848,9 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * digest @@ -858,17 +858,17 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -906,7 +906,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m05500_a1-pure.cl b/OpenCL/m05500_a1-pure.cl index 4d652308e..e84e32423 100644 --- a/OpenCL/m05500_a1-pure.cl +++ b/OpenCL/m05500_a1-pure.cl @@ -549,15 +549,15 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * base @@ -573,7 +573,7 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -680,7 +680,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -688,19 +688,19 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * base @@ -716,7 +716,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; diff --git a/OpenCL/m05500_a3-optimized.cl b/OpenCL/m05500_a3-optimized.cl index f68221f98..e45687609 100644 --- a/OpenCL/m05500_a3-optimized.cl +++ b/OpenCL/m05500_a3-optimized.cl @@ -513,9 +513,9 @@ DECLSPEC void m05500m (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * loop @@ -523,7 +523,7 @@ DECLSPEC void m05500m (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -670,9 +670,9 @@ DECLSPEC void m05500s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * digest @@ -680,10 +680,10 @@ DECLSPEC void m05500s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -692,7 +692,7 @@ DECLSPEC void m05500s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -882,7 +882,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -913,7 +913,7 @@ KERNEL_FQ void m05500_m04 (KERN_ATTR_VECTOR ()) * main */ - m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05500_m08 (KERN_ATTR_VECTOR ()) @@ -965,7 +965,7 @@ KERNEL_FQ void m05500_m08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -996,7 +996,7 @@ KERNEL_FQ void m05500_m08 (KERN_ATTR_VECTOR ()) * main */ - m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05500_m16 (KERN_ATTR_VECTOR ()) @@ -1048,7 +1048,7 @@ KERNEL_FQ void m05500_m16 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1079,7 +1079,7 @@ KERNEL_FQ void m05500_m16 (KERN_ATTR_VECTOR ()) * main */ - m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05500_s04 (KERN_ATTR_VECTOR ()) @@ -1131,7 +1131,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1162,7 +1162,7 @@ KERNEL_FQ void m05500_s04 (KERN_ATTR_VECTOR ()) * main */ - m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05500_s08 (KERN_ATTR_VECTOR ()) @@ -1214,7 +1214,7 @@ KERNEL_FQ void m05500_s08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1245,7 +1245,7 @@ KERNEL_FQ void m05500_s08 (KERN_ATTR_VECTOR ()) * main */ - m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m05500_s16 (KERN_ATTR_VECTOR ()) @@ -1297,7 +1297,7 @@ KERNEL_FQ void m05500_s16 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1328,5 +1328,5 @@ KERNEL_FQ void m05500_s16 (KERN_ATTR_VECTOR ()) * main */ - m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m05500_a3-pure.cl b/OpenCL/m05500_a3-pure.cl index efa2405ae..caeaa9622 100644 --- a/OpenCL/m05500_a3-pure.cl +++ b/OpenCL/m05500_a3-pure.cl @@ -549,15 +549,15 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * base @@ -578,7 +578,7 @@ KERNEL_FQ void m05500_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -693,7 +693,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -701,19 +701,19 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; /** * base @@ -734,7 +734,7 @@ KERNEL_FQ void m05500_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m05600_a0-optimized.cl b/OpenCL/m05600_a0-optimized.cl index f854f1b57..87a0e6b02 100644 --- a/OpenCL/m05600_a0-optimized.cl +++ b/OpenCL/m05600_a0-optimized.cl @@ -132,25 +132,25 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; - const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET].user_len - + esalt_bufs[DIGESTS_OFFSET].domain_len; + const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len + + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len; - const u32 chall_len = esalt_bufs[DIGESTS_OFFSET].srvchall_len - + esalt_bufs[DIGESTS_OFFSET].clichall_len; + const u32 chall_len = esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len; /** * base @@ -174,7 +174,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -371,25 +371,25 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; - const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET].user_len - + esalt_bufs[DIGESTS_OFFSET].domain_len; + const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len + + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len; - const u32 chall_len = esalt_bufs[DIGESTS_OFFSET].srvchall_len - + esalt_bufs[DIGESTS_OFFSET].clichall_len; + const u32 chall_len = esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len; /** * base @@ -415,17 +415,17 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m05600_a0-pure.cl b/OpenCL/m05600_a0-pure.cl index 00c1101ef..b91bda7fb 100644 --- a/OpenCL/m05600_a0-pure.cl +++ b/OpenCL/m05600_a0-pure.cl @@ -38,7 +38,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -50,7 +50,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -90,7 +90,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -115,7 +115,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); @@ -137,7 +137,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -145,10 +145,10 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -161,7 +161,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -201,7 +201,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -226,7 +226,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); diff --git a/OpenCL/m05600_a1-optimized.cl b/OpenCL/m05600_a1-optimized.cl index ded594bcd..3bda042e3 100644 --- a/OpenCL/m05600_a1-optimized.cl +++ b/OpenCL/m05600_a1-optimized.cl @@ -130,25 +130,25 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; - const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET].user_len - + esalt_bufs[DIGESTS_OFFSET].domain_len; + const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len + + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len; - const u32 chall_len = esalt_bufs[DIGESTS_OFFSET].srvchall_len - + esalt_bufs[DIGESTS_OFFSET].clichall_len; + const u32 chall_len = esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len; /** * base @@ -172,7 +172,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -210,7 +210,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -427,25 +427,25 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; - const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET].user_len - + esalt_bufs[DIGESTS_OFFSET].domain_len; + const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len + + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len; - const u32 chall_len = esalt_bufs[DIGESTS_OFFSET].srvchall_len - + esalt_bufs[DIGESTS_OFFSET].clichall_len; + const u32 chall_len = esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len; /** * base @@ -471,17 +471,17 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -519,7 +519,7 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m05600_a1-pure.cl b/OpenCL/m05600_a1-pure.cl index cc30a2715..ac362c571 100644 --- a/OpenCL/m05600_a1-pure.cl +++ b/OpenCL/m05600_a1-pure.cl @@ -36,7 +36,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -52,7 +52,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx1 = ctx10; @@ -86,7 +86,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -111,7 +111,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); @@ -133,7 +133,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -141,10 +141,10 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -161,7 +161,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx1 = ctx10; @@ -195,7 +195,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -220,7 +220,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); diff --git a/OpenCL/m05600_a3-optimized.cl b/OpenCL/m05600_a3-optimized.cl index cb6d6fa93..78a6bb739 100644 --- a/OpenCL/m05600_a3-optimized.cl +++ b/OpenCL/m05600_a3-optimized.cl @@ -125,11 +125,11 @@ DECLSPEC void m05600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * prepare */ - const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET].user_len - + esalt_bufs[DIGESTS_OFFSET].domain_len; + const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len + + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len; - const u32 chall_len = esalt_bufs[DIGESTS_OFFSET].srvchall_len - + esalt_bufs[DIGESTS_OFFSET].clichall_len; + const u32 chall_len = esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len; /** * loop @@ -137,7 +137,7 @@ DECLSPEC void m05600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -331,11 +331,11 @@ DECLSPEC void m05600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * prepare */ - const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET].user_len - + esalt_bufs[DIGESTS_OFFSET].domain_len; + const u32 userdomain_len = esalt_bufs[DIGESTS_OFFSET_HOST].user_len + + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len; - const u32 chall_len = esalt_bufs[DIGESTS_OFFSET].srvchall_len - + esalt_bufs[DIGESTS_OFFSET].clichall_len; + const u32 chall_len = esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len; /** * digest @@ -343,10 +343,10 @@ DECLSPEC void m05600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -355,7 +355,7 @@ DECLSPEC void m05600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -554,19 +554,19 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -606,7 +606,7 @@ KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) * main */ - m05600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_userdomain_buf, s_chall_buf); + m05600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_userdomain_buf, s_chall_buf); } KERNEL_FQ void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) @@ -627,19 +627,19 @@ KERNEL_FQ void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -679,7 +679,7 @@ KERNEL_FQ void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) * main */ - m05600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_userdomain_buf, s_chall_buf); + m05600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_userdomain_buf, s_chall_buf); } KERNEL_FQ void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) @@ -700,19 +700,19 @@ KERNEL_FQ void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -752,7 +752,7 @@ KERNEL_FQ void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) * main */ - m05600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_userdomain_buf, s_chall_buf); + m05600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_userdomain_buf, s_chall_buf); } KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) @@ -773,19 +773,19 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -825,7 +825,7 @@ KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) * main */ - m05600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_userdomain_buf, s_chall_buf); + m05600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_userdomain_buf, s_chall_buf); } KERNEL_FQ void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) @@ -846,19 +846,19 @@ KERNEL_FQ void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -898,7 +898,7 @@ KERNEL_FQ void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) * main */ - m05600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_userdomain_buf, s_chall_buf); + m05600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_userdomain_buf, s_chall_buf); } KERNEL_FQ void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) @@ -919,19 +919,19 @@ KERNEL_FQ void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) for (u32 i = lid; i < 64; i += lsz) { - s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET].userdomain_buf[i]; + s_userdomain_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf[i]; } LOCAL_VK u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET].chall_buf[i]; + s_chall_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -971,5 +971,5 @@ KERNEL_FQ void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) * main */ - m05600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_userdomain_buf, s_chall_buf); + m05600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_userdomain_buf, s_chall_buf); } diff --git a/OpenCL/m05600_a3-pure.cl b/OpenCL/m05600_a3-pure.cl index 324e131e6..50d0ede08 100644 --- a/OpenCL/m05600_a3-pure.cl +++ b/OpenCL/m05600_a3-pure.cl @@ -36,7 +36,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -57,7 +57,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -99,7 +99,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -124,7 +124,7 @@ KERNEL_FQ void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); @@ -146,7 +146,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -154,10 +154,10 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -179,7 +179,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -221,7 +221,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -246,7 +246,7 @@ KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl index 9f8f5a3cc..ff6f6bc2a 100644 --- a/OpenCL/m05800-optimized.cl +++ b/OpenCL/m05800-optimized.cl @@ -2211,7 +2211,7 @@ KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 word_buf[4]; @@ -2226,15 +2226,15 @@ KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) * salt */ - u32 salt_len = salt_bufs[SALT_POS].salt_len; + u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; /** * init @@ -2317,7 +2317,7 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -2344,21 +2344,21 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) * salt */ - u32 salt_len = salt_bufs[SALT_POS].salt_len; + u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; /** * loop */ - for (u32 i = 0, j = loop_pos + 1; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS + 1; i < LOOP_CNT; i++, j++) { const u32 pc_dec = s_pc_dec[j]; const u32 pc_len = s_pc_len[j]; @@ -2419,7 +2419,7 @@ KERNEL_FQ void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m05800-pure.cl b/OpenCL/m05800-pure.cl index 3ba49b52e..3898adc3c 100644 --- a/OpenCL/m05800-pure.cl +++ b/OpenCL/m05800-pure.cl @@ -2080,7 +2080,7 @@ KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t ctx; @@ -2095,7 +2095,7 @@ KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); - sha1_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_final (&ctx); @@ -2131,7 +2131,7 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -2146,13 +2146,13 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } u32 digest[5]; @@ -2167,7 +2167,7 @@ KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) * loop */ - for (u32 i = 0, j = loop_pos + 1; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS + 1; i < LOOP_CNT; i++, j++) { const u32 pc_dec = s_pc_dec[j]; const u32 pc_len = s_pc_len[j]; @@ -2213,7 +2213,7 @@ KERNEL_FQ void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m06000_a0-optimized.cl b/OpenCL/m06000_a0-optimized.cl index fac50293b..df6f1dcd3 100644 --- a/OpenCL/m06000_a0-optimized.cl +++ b/OpenCL/m06000_a0-optimized.cl @@ -35,7 +35,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,7 +55,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -125,7 +125,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -147,17 +147,17 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m06000_a0-pure.cl b/OpenCL/m06000_a0-pure.cl index e4513fd7b..be104c8b6 100644 --- a/OpenCL/m06000_a0-pure.cl +++ b/OpenCL/m06000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m06000_a1-optimized.cl b/OpenCL/m06000_a1-optimized.cl index 374e54bee..760c50563 100644 --- a/OpenCL/m06000_a1-optimized.cl +++ b/OpenCL/m06000_a1-optimized.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,7 +53,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -91,7 +91,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -181,7 +181,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -203,17 +203,17 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -251,7 +251,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m06000_a1-pure.cl b/OpenCL/m06000_a1-pure.cl index 2e095778a..1871a7fd2 100644 --- a/OpenCL/m06000_a1-pure.cl +++ b/OpenCL/m06000_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; diff --git a/OpenCL/m06000_a3-optimized.cl b/OpenCL/m06000_a3-optimized.cl index 6dd6b9bca..40668aca2 100644 --- a/OpenCL/m06000_a3-optimized.cl +++ b/OpenCL/m06000_a3-optimized.cl @@ -34,7 +34,7 @@ DECLSPEC void m06000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -92,10 +92,10 @@ DECLSPEC void m06000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -104,7 +104,7 @@ DECLSPEC void m06000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -155,7 +155,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -191,7 +191,7 @@ KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) * main */ - m06000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m06000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m06000_m08 (KERN_ATTR_BASIC ()) @@ -202,7 +202,7 @@ KERNEL_FQ void m06000_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -238,7 +238,7 @@ KERNEL_FQ void m06000_m08 (KERN_ATTR_BASIC ()) * main */ - m06000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m06000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m06000_m16 (KERN_ATTR_BASIC ()) @@ -249,7 +249,7 @@ KERNEL_FQ void m06000_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -285,7 +285,7 @@ KERNEL_FQ void m06000_m16 (KERN_ATTR_BASIC ()) * main */ - m06000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m06000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) @@ -296,7 +296,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -332,7 +332,7 @@ KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) * main */ - m06000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m06000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m06000_s08 (KERN_ATTR_BASIC ()) @@ -343,7 +343,7 @@ KERNEL_FQ void m06000_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -379,7 +379,7 @@ KERNEL_FQ void m06000_s08 (KERN_ATTR_BASIC ()) * main */ - m06000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m06000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m06000_s16 (KERN_ATTR_BASIC ()) @@ -390,7 +390,7 @@ KERNEL_FQ void m06000_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -426,5 +426,5 @@ KERNEL_FQ void m06000_s16 (KERN_ATTR_BASIC ()) * main */ - m06000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m06000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m06000_a3-pure.cl b/OpenCL/m06000_a3-pure.cl index 292f8cb89..2112b3578 100644 --- a/OpenCL/m06000_a3-pure.cl +++ b/OpenCL/m06000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m06000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m06000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m06100_a0-optimized.cl b/OpenCL/m06100_a0-optimized.cl index 4d18ffa9c..9c58a9f21 100644 --- a/OpenCL/m06100_a0-optimized.cl +++ b/OpenCL/m06100_a0-optimized.cl @@ -73,7 +73,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -97,7 +97,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -216,7 +216,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -242,17 +242,17 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m06100_a0-pure.cl b/OpenCL/m06100_a0-pure.cl index db9b6b775..e702168e2 100644 --- a/OpenCL/m06100_a0-pure.cl +++ b/OpenCL/m06100_a0-pure.cl @@ -68,7 +68,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,7 +80,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -155,7 +155,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -163,10 +163,10 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -179,7 +179,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m06100_a1-optimized.cl b/OpenCL/m06100_a1-optimized.cl index 0f09db30a..316bf89d9 100644 --- a/OpenCL/m06100_a1-optimized.cl +++ b/OpenCL/m06100_a1-optimized.cl @@ -71,7 +71,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -95,7 +95,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -133,7 +133,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -272,7 +272,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -298,17 +298,17 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -346,7 +346,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m06100_a1-pure.cl b/OpenCL/m06100_a1-pure.cl index 51e895a36..3e86ac629 100644 --- a/OpenCL/m06100_a1-pure.cl +++ b/OpenCL/m06100_a1-pure.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,7 +82,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -151,7 +151,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -159,10 +159,10 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -179,7 +179,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; diff --git a/OpenCL/m06100_a3-optimized.cl b/OpenCL/m06100_a3-optimized.cl index 8b192c575..8ac3d3d2a 100644 --- a/OpenCL/m06100_a3-optimized.cl +++ b/OpenCL/m06100_a3-optimized.cl @@ -34,7 +34,7 @@ DECLSPEC void m06100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -103,10 +103,10 @@ DECLSPEC void m06100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ DECLSPEC void m06100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -221,7 +221,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -261,7 +261,7 @@ KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) * main */ - m06100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); + m06100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); } KERNEL_FQ void m06100_m08 (KERN_ATTR_BASIC ()) @@ -316,7 +316,7 @@ KERNEL_FQ void m06100_m08 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -356,7 +356,7 @@ KERNEL_FQ void m06100_m08 (KERN_ATTR_BASIC ()) * main */ - m06100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); + m06100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); } KERNEL_FQ void m06100_m16 (KERN_ATTR_BASIC ()) @@ -415,7 +415,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -455,7 +455,7 @@ KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) * main */ - m06100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); + m06100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); } KERNEL_FQ void m06100_s08 (KERN_ATTR_BASIC ()) @@ -510,7 +510,7 @@ KERNEL_FQ void m06100_s08 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -550,7 +550,7 @@ KERNEL_FQ void m06100_s08 (KERN_ATTR_BASIC ()) * main */ - m06100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); + m06100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_MT0, s_MT1, s_MT2, s_MT3, s_MT4, s_MT5, s_MT6, s_MT7); } KERNEL_FQ void m06100_s16 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m06100_a3-pure.cl b/OpenCL/m06100_a3-pure.cl index 75cda9773..d6961d438 100644 --- a/OpenCL/m06100_a3-pure.cl +++ b/OpenCL/m06100_a3-pure.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -87,7 +87,7 @@ KERNEL_FQ void m06100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -164,7 +164,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -172,10 +172,10 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -197,7 +197,7 @@ KERNEL_FQ void m06100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m06211-pure.cl b/OpenCL/m06211-pure.cl index 2fa16348f..68719c289 100644 --- a/OpenCL/m06211-pure.cl +++ b/OpenCL/m06211-pure.cl @@ -93,18 +93,18 @@ KERNEL_FQ void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -149,7 +149,7 @@ KERNEL_FQ void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -167,7 +167,7 @@ KERNEL_FQ void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) tmps[gid].opad[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 5, j += 1) { @@ -217,7 +217,7 @@ KERNEL_FQ void m06211_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -251,7 +251,7 @@ KERNEL_FQ void m06211_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -355,7 +355,7 @@ KERNEL_FQ void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -383,7 +383,7 @@ KERNEL_FQ void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -391,7 +391,7 @@ KERNEL_FQ void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -399,7 +399,7 @@ KERNEL_FQ void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06212-pure.cl b/OpenCL/m06212-pure.cl index f714e733c..7588f9b5f 100644 --- a/OpenCL/m06212-pure.cl +++ b/OpenCL/m06212-pure.cl @@ -93,18 +93,18 @@ KERNEL_FQ void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -149,7 +149,7 @@ KERNEL_FQ void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -167,7 +167,7 @@ KERNEL_FQ void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) tmps[gid].opad[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 32; i += 5, j += 1) { @@ -217,7 +217,7 @@ KERNEL_FQ void m06212_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -251,7 +251,7 @@ KERNEL_FQ void m06212_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -355,7 +355,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -383,7 +383,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -391,7 +391,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -399,7 +399,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -429,7 +429,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -437,7 +437,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -445,7 +445,7 @@ KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06213-pure.cl b/OpenCL/m06213-pure.cl index 09b99d792..20bc9356f 100644 --- a/OpenCL/m06213-pure.cl +++ b/OpenCL/m06213-pure.cl @@ -93,18 +93,18 @@ KERNEL_FQ void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -149,7 +149,7 @@ KERNEL_FQ void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -167,7 +167,7 @@ KERNEL_FQ void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) tmps[gid].opad[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 48; i += 5, j += 1) { @@ -217,7 +217,7 @@ KERNEL_FQ void m06213_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -251,7 +251,7 @@ KERNEL_FQ void m06213_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -355,7 +355,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -383,7 +383,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -391,7 +391,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -399,7 +399,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -429,7 +429,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -437,7 +437,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -445,7 +445,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -475,7 +475,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -483,7 +483,7 @@ KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06221-pure.cl b/OpenCL/m06221-pure.cl index 8172d9c3a..ab38d23a4 100644 --- a/OpenCL/m06221-pure.cl +++ b/OpenCL/m06221-pure.cl @@ -115,18 +115,18 @@ KERNEL_FQ void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -171,7 +171,7 @@ KERNEL_FQ void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha512_hmac_ctx_t sha512_hmac_ctx; @@ -195,7 +195,7 @@ KERNEL_FQ void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -271,7 +271,7 @@ KERNEL_FQ void m06221_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -317,7 +317,7 @@ KERNEL_FQ void m06221_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -450,7 +450,7 @@ KERNEL_FQ void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -478,7 +478,7 @@ KERNEL_FQ void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -486,7 +486,7 @@ KERNEL_FQ void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -494,7 +494,7 @@ KERNEL_FQ void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06222-pure.cl b/OpenCL/m06222-pure.cl index 690d1ffa7..27ca6c61a 100644 --- a/OpenCL/m06222-pure.cl +++ b/OpenCL/m06222-pure.cl @@ -115,18 +115,18 @@ KERNEL_FQ void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -171,7 +171,7 @@ KERNEL_FQ void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha512_hmac_ctx_t sha512_hmac_ctx; @@ -195,7 +195,7 @@ KERNEL_FQ void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 8, j += 1) { @@ -271,7 +271,7 @@ KERNEL_FQ void m06222_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -317,7 +317,7 @@ KERNEL_FQ void m06222_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -450,7 +450,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -478,7 +478,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -486,7 +486,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -494,7 +494,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -524,7 +524,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -532,7 +532,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -540,7 +540,7 @@ KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06223-pure.cl b/OpenCL/m06223-pure.cl index 7d251da66..f26b56590 100644 --- a/OpenCL/m06223-pure.cl +++ b/OpenCL/m06223-pure.cl @@ -115,18 +115,18 @@ KERNEL_FQ void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -171,7 +171,7 @@ KERNEL_FQ void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha512_hmac_ctx_t sha512_hmac_ctx; @@ -195,7 +195,7 @@ KERNEL_FQ void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 24; i += 8, j += 1) { @@ -271,7 +271,7 @@ KERNEL_FQ void m06223_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -317,7 +317,7 @@ KERNEL_FQ void m06223_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -450,7 +450,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -478,7 +478,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -486,7 +486,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -494,7 +494,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -524,7 +524,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -532,7 +532,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -540,7 +540,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -570,7 +570,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -578,7 +578,7 @@ KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06231-pure.cl b/OpenCL/m06231-pure.cl index 687343337..4a3b3aaef 100644 --- a/OpenCL/m06231-pure.cl +++ b/OpenCL/m06231-pure.cl @@ -153,13 +153,13 @@ KERNEL_FQ void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -206,7 +206,7 @@ KERNEL_FQ void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -251,7 +251,7 @@ KERNEL_FQ void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); whirlpool_hmac_ctx_t whirlpool_hmac_ctx; @@ -291,7 +291,7 @@ KERNEL_FQ void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) tmps[gid].opad[14] = whirlpool_hmac_ctx.opad.h[14]; tmps[gid].opad[15] = whirlpool_hmac_ctx.opad.h[15]; - whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 16, j += 1) { @@ -407,7 +407,7 @@ KERNEL_FQ void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[16]; u32x opad[16]; @@ -485,7 +485,7 @@ KERNEL_FQ void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) out[14] = packv (tmps, out, gid, i + 14); out[15] = packv (tmps, out, gid, i + 15); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -622,7 +622,7 @@ KERNEL_FQ void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -650,7 +650,7 @@ KERNEL_FQ void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -658,7 +658,7 @@ KERNEL_FQ void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -666,7 +666,7 @@ KERNEL_FQ void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06232-pure.cl b/OpenCL/m06232-pure.cl index d123edc8a..6cba2bd65 100644 --- a/OpenCL/m06232-pure.cl +++ b/OpenCL/m06232-pure.cl @@ -153,13 +153,13 @@ KERNEL_FQ void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -206,7 +206,7 @@ KERNEL_FQ void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -251,7 +251,7 @@ KERNEL_FQ void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); whirlpool_hmac_ctx_t whirlpool_hmac_ctx; @@ -291,7 +291,7 @@ KERNEL_FQ void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) tmps[gid].opad[14] = whirlpool_hmac_ctx.opad.h[14]; tmps[gid].opad[15] = whirlpool_hmac_ctx.opad.h[15]; - whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 32; i += 16, j += 1) { @@ -407,7 +407,7 @@ KERNEL_FQ void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[16]; u32x opad[16]; @@ -485,7 +485,7 @@ KERNEL_FQ void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) out[14] = packv (tmps, out, gid, i + 14); out[15] = packv (tmps, out, gid, i + 15); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -622,7 +622,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -650,7 +650,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -658,7 +658,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -666,7 +666,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -696,7 +696,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -704,7 +704,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -712,7 +712,7 @@ KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06233-pure.cl b/OpenCL/m06233-pure.cl index 73456851e..4cb39f003 100644 --- a/OpenCL/m06233-pure.cl +++ b/OpenCL/m06233-pure.cl @@ -153,13 +153,13 @@ KERNEL_FQ void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -206,7 +206,7 @@ KERNEL_FQ void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -251,7 +251,7 @@ KERNEL_FQ void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_tc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); whirlpool_hmac_ctx_t whirlpool_hmac_ctx; @@ -291,7 +291,7 @@ KERNEL_FQ void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) tmps[gid].opad[14] = whirlpool_hmac_ctx.opad.h[14]; tmps[gid].opad[15] = whirlpool_hmac_ctx.opad.h[15]; - whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 48; i += 16, j += 1) { @@ -407,7 +407,7 @@ KERNEL_FQ void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[16]; u32x opad[16]; @@ -485,7 +485,7 @@ KERNEL_FQ void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) out[14] = packv (tmps, out, gid, i + 14); out[15] = packv (tmps, out, gid, i + 15); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -622,7 +622,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey1[8]; @@ -650,7 +650,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -658,7 +658,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -666,7 +666,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -696,7 +696,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -704,7 +704,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -712,7 +712,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -742,7 +742,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -750,7 +750,7 @@ KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl index f242259da..3f72c1358 100644 --- a/OpenCL/m06300-optimized.cl +++ b/OpenCL/m06300-optimized.cl @@ -581,7 +581,7 @@ KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -598,10 +598,10 @@ KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * init @@ -739,7 +739,7 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -765,10 +765,10 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -817,7 +817,7 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) block3[2] = 0; block3[3] = 0; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { block1[0] = 0; block1[1] = 0; @@ -927,7 +927,7 @@ KERNEL_FQ void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m06300-pure.cl b/OpenCL/m06300-pure.cl index ecdf09703..1578ec94b 100644 --- a/OpenCL/m06300-pure.cl +++ b/OpenCL/m06300-pure.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -45,13 +45,13 @@ KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -130,7 +130,7 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -145,13 +145,13 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -169,7 +169,7 @@ KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) * loop */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { md5_ctx_t md5_ctx; @@ -225,7 +225,7 @@ KERNEL_FQ void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m06400-pure.cl b/OpenCL/m06400-pure.cl index 790a25ce1..576cb798f 100644 --- a/OpenCL/m06400-pure.cl +++ b/OpenCL/m06400-pure.cl @@ -77,7 +77,7 @@ KERNEL_FQ void m06400_init (KERN_ATTR_TMPS (sha256aix_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -101,7 +101,7 @@ KERNEL_FQ void m06400_init (KERN_ATTR_TMPS (sha256aix_tmp_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -157,7 +157,7 @@ KERNEL_FQ void m06400_loop (KERN_ATTR_TMPS (sha256aix_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -203,7 +203,7 @@ KERNEL_FQ void m06400_loop (KERN_ATTR_TMPS (sha256aix_tmp_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -267,7 +267,7 @@ KERNEL_FQ void m06400_comp (KERN_ATTR_TMPS (sha256aix_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m06500-pure.cl b/OpenCL/m06500-pure.cl index 6d75313ce..0127d9139 100644 --- a/OpenCL/m06500-pure.cl +++ b/OpenCL/m06500-pure.cl @@ -93,7 +93,7 @@ KERNEL_FQ void m06500_init (KERN_ATTR_TMPS (sha512aix_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -117,7 +117,7 @@ KERNEL_FQ void m06500_init (KERN_ATTR_TMPS (sha512aix_tmp_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 w0[4]; u32 w1[4]; @@ -188,7 +188,7 @@ KERNEL_FQ void m06500_loop (KERN_ATTR_TMPS (sha512aix_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -232,7 +232,7 @@ KERNEL_FQ void m06500_loop (KERN_ATTR_TMPS (sha512aix_tmp_t)) out[6] = pack64v (tmps, out, gid, 6); out[7] = pack64v (tmps, out, gid, 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -315,7 +315,7 @@ KERNEL_FQ void m06500_comp (KERN_ATTR_TMPS (sha512aix_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m06600-pure.cl b/OpenCL/m06600-pure.cl index f0494946c..0cccf5205 100644 --- a/OpenCL/m06600-pure.cl +++ b/OpenCL/m06600-pure.cl @@ -72,7 +72,7 @@ KERNEL_FQ void m06600_init (KERN_ATTR_TMPS (agilekey_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -95,10 +95,10 @@ KERNEL_FQ void m06600_init (KERN_ATTR_TMPS (agilekey_tmp_t)) u32 s[16] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - sha1_hmac_update_swap (&sha1_hmac_ctx, s, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_swap (&sha1_hmac_ctx, s, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -148,7 +148,7 @@ KERNEL_FQ void m06600_loop (KERN_ATTR_TMPS (agilekey_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -182,7 +182,7 @@ KERNEL_FQ void m06600_loop (KERN_ATTR_TMPS (agilekey_tmp_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -286,7 +286,7 @@ KERNEL_FQ void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -294,18 +294,18 @@ KERNEL_FQ void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[ 4], - salt_bufs[SALT_POS].salt_buf[ 5], - salt_bufs[SALT_POS].salt_buf[ 6], - salt_bufs[SALT_POS].salt_buf[ 7] + salt_bufs[SALT_POS_HOST].salt_buf[ 4], + salt_bufs[SALT_POS_HOST].salt_buf[ 5], + salt_bufs[SALT_POS_HOST].salt_buf[ 6], + salt_bufs[SALT_POS_HOST].salt_buf[ 7] }; const u32 data[4] = { - salt_bufs[SALT_POS].salt_buf[ 8], - salt_bufs[SALT_POS].salt_buf[ 9], - salt_bufs[SALT_POS].salt_buf[10], - salt_bufs[SALT_POS].salt_buf[11] + salt_bufs[SALT_POS_HOST].salt_buf[ 8], + salt_bufs[SALT_POS_HOST].salt_buf[ 9], + salt_bufs[SALT_POS_HOST].salt_buf[10], + salt_bufs[SALT_POS_HOST].salt_buf[11] }; /** diff --git a/OpenCL/m06700-pure.cl b/OpenCL/m06700-pure.cl index 68ed6941f..12378ae8d 100644 --- a/OpenCL/m06700-pure.cl +++ b/OpenCL/m06700-pure.cl @@ -71,7 +71,7 @@ KERNEL_FQ void m06700_init (KERN_ATTR_TMPS (sha1aix_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -89,7 +89,7 @@ KERNEL_FQ void m06700_init (KERN_ATTR_TMPS (sha1aix_tmp_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -139,7 +139,7 @@ KERNEL_FQ void m06700_loop (KERN_ATTR_TMPS (sha1aix_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -173,7 +173,7 @@ KERNEL_FQ void m06700_loop (KERN_ATTR_TMPS (sha1aix_tmp_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -228,7 +228,7 @@ KERNEL_FQ void m06700_comp (KERN_ATTR_TMPS (sha1aix_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m06800-pure.cl b/OpenCL/m06800-pure.cl index 56d50c039..ce6691e36 100644 --- a/OpenCL/m06800-pure.cl +++ b/OpenCL/m06800-pure.cl @@ -78,7 +78,7 @@ KERNEL_FQ void m06800_init (KERN_ATTR_TMPS (lastpass_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -102,7 +102,7 @@ KERNEL_FQ void m06800_init (KERN_ATTR_TMPS (lastpass_tmp_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -158,7 +158,7 @@ KERNEL_FQ void m06800_loop (KERN_ATTR_TMPS (lastpass_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -204,7 +204,7 @@ KERNEL_FQ void m06800_loop (KERN_ATTR_TMPS (lastpass_tmp_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -317,7 +317,7 @@ KERNEL_FQ void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -337,10 +337,10 @@ KERNEL_FQ void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) { const u32 data[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3], }; #define KEYLEN 60 @@ -353,14 +353,14 @@ KERNEL_FQ void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) AES256_decrypt (ks, data, out, s_td0, s_td1, s_td2, s_td3, s_td4); - u32 salt_len = salt_bufs[SALT_POS].salt_len; + u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; out[0] = hc_swap32_S (out[0]); out[1] = hc_swap32_S (out[1]); @@ -374,9 +374,9 @@ KERNEL_FQ void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) && (out[2] == salt_buf[2]) && (out[3] == salt_buf[3])) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl index b8abcb7e0..e8fafdda4 100644 --- a/OpenCL/m06900_a0-optimized.cl +++ b/OpenCL/m06900_a0-optimized.cl @@ -724,7 +724,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -748,7 +748,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -940,7 +940,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -966,17 +966,17 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m06900_a1-optimized.cl b/OpenCL/m06900_a1-optimized.cl index 760133c95..028ee5f5f 100644 --- a/OpenCL/m06900_a1-optimized.cl +++ b/OpenCL/m06900_a1-optimized.cl @@ -722,7 +722,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -746,7 +746,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -784,7 +784,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -992,7 +992,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1018,17 +1018,17 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -1066,7 +1066,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m06900_a3-optimized.cl b/OpenCL/m06900_a3-optimized.cl index 289cda5bc..40af86b42 100644 --- a/OpenCL/m06900_a3-optimized.cl +++ b/OpenCL/m06900_a3-optimized.cl @@ -711,7 +711,7 @@ DECLSPEC void m06900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -885,10 +885,10 @@ DECLSPEC void m06900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -897,7 +897,7 @@ DECLSPEC void m06900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -1082,7 +1082,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1122,7 +1122,7 @@ KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) * main */ - m06900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_tables); + m06900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_tables); } KERNEL_FQ void m06900_m08 (KERN_ATTR_BASIC ()) @@ -1151,7 +1151,7 @@ KERNEL_FQ void m06900_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1191,7 +1191,7 @@ KERNEL_FQ void m06900_m08 (KERN_ATTR_BASIC ()) * main */ - m06900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_tables); + m06900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_tables); } KERNEL_FQ void m06900_m16 (KERN_ATTR_BASIC ()) @@ -1224,7 +1224,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1264,7 +1264,7 @@ KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) * main */ - m06900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_tables); + m06900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_tables); } KERNEL_FQ void m06900_s08 (KERN_ATTR_BASIC ()) @@ -1293,7 +1293,7 @@ KERNEL_FQ void m06900_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1333,7 +1333,7 @@ KERNEL_FQ void m06900_s08 (KERN_ATTR_BASIC ()) * main */ - m06900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_tables); + m06900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_tables); } KERNEL_FQ void m06900_s16 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m07000_a0-optimized.cl b/OpenCL/m07000_a0-optimized.cl index 584ca64cb..ad06184c0 100644 --- a/OpenCL/m07000_a0-optimized.cl +++ b/OpenCL/m07000_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -52,19 +52,19 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = 12; // salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 12; // salt_bufs[SALT_POS_HOST].salt_len; const u32 magic_len = 24; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -292,7 +292,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -314,12 +314,12 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = 12; // salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 12; // salt_bufs[SALT_POS_HOST].salt_len; const u32 magic_len = 24; /** @@ -328,10 +328,10 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -344,7 +344,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m07000_a0-pure.cl b/OpenCL/m07000_a0-pure.cl index 7d2a1dea4..ebe589789 100644 --- a/OpenCL/m07000_a0-pure.cl +++ b/OpenCL/m07000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -101,7 +101,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -125,13 +125,13 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m07000_a1-optimized.cl b/OpenCL/m07000_a1-optimized.cl index c701f3590..3021ec78b 100644 --- a/OpenCL/m07000_a1-optimized.cl +++ b/OpenCL/m07000_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,19 +50,19 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = 12; // salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 12; // salt_bufs[SALT_POS_HOST].salt_len; const u32 magic_len = 24; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -100,7 +100,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -350,7 +350,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -372,12 +372,12 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = 12; // salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 12; // salt_bufs[SALT_POS_HOST].salt_len; const u32 magic_len = 24; /** @@ -386,10 +386,10 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -402,7 +402,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -440,7 +440,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m07000_a1-pure.cl b/OpenCL/m07000_a1-pure.cl index b37981505..e6d556144 100644 --- a/OpenCL/m07000_a1-pure.cl +++ b/OpenCL/m07000_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -95,7 +95,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -117,7 +117,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -125,7 +125,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m07000_a3-optimized.cl b/OpenCL/m07000_a3-optimized.cl index 71d52a4e8..f05d76cb3 100644 --- a/OpenCL/m07000_a3-optimized.cl +++ b/OpenCL/m07000_a3-optimized.cl @@ -32,9 +32,9 @@ DECLSPEC void m07000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); salt_buf0[3] = 0; salt_buf1[0] = 0; salt_buf1[1] = 0; @@ -49,7 +49,7 @@ DECLSPEC void m07000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = 12; // salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 12; // salt_bufs[SALT_POS_HOST].salt_len; u32 magic_buf0[4]; u32 magic_buf1[4]; @@ -106,7 +106,7 @@ DECLSPEC void m07000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -299,9 +299,9 @@ DECLSPEC void m07000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); salt_buf0[3] = 0; salt_buf1[0] = 0; salt_buf1[1] = 0; @@ -316,7 +316,7 @@ DECLSPEC void m07000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = 0; salt_buf3[3] = 0; - const u32 salt_len = 12; // salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 12; // salt_bufs[SALT_POS_HOST].salt_len; u32 magic_buf0[4]; u32 magic_buf1[4]; @@ -373,10 +373,10 @@ DECLSPEC void m07000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -391,7 +391,7 @@ DECLSPEC void m07000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -577,7 +577,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -619,7 +619,7 @@ KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) * main */ - m07000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07000_m08 (KERN_ATTR_BASIC ()) @@ -630,7 +630,7 @@ KERNEL_FQ void m07000_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -672,7 +672,7 @@ KERNEL_FQ void m07000_m08 (KERN_ATTR_BASIC ()) * main */ - m07000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07000_m16 (KERN_ATTR_BASIC ()) @@ -683,7 +683,7 @@ KERNEL_FQ void m07000_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -725,7 +725,7 @@ KERNEL_FQ void m07000_m16 (KERN_ATTR_BASIC ()) * main */ - m07000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) @@ -736,7 +736,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -778,7 +778,7 @@ KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) * main */ - m07000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07000_s08 (KERN_ATTR_BASIC ()) @@ -789,7 +789,7 @@ KERNEL_FQ void m07000_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -831,7 +831,7 @@ KERNEL_FQ void m07000_s08 (KERN_ATTR_BASIC ()) * main */ - m07000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07000_s16 (KERN_ATTR_BASIC ()) @@ -842,7 +842,7 @@ KERNEL_FQ void m07000_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -884,5 +884,5 @@ KERNEL_FQ void m07000_s16 (KERN_ATTR_BASIC ()) * main */ - m07000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m07000_a3-pure.cl b/OpenCL/m07000_a3-pure.cl index fe7d65f61..ce108a2ae 100644 --- a/OpenCL/m07000_a3-pure.cl +++ b/OpenCL/m07000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m07000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,7 +112,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -120,10 +120,10 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -143,7 +143,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -151,7 +151,7 @@ KERNEL_FQ void m07000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m07100-pure.cl b/OpenCL/m07100-pure.cl index 0d8ab017c..f3d1b15a1 100644 --- a/OpenCL/m07100-pure.cl +++ b/OpenCL/m07100-pure.cl @@ -99,7 +99,7 @@ KERNEL_FQ void m07100_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -123,7 +123,7 @@ KERNEL_FQ void m07100_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -199,7 +199,7 @@ KERNEL_FQ void m07100_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -245,7 +245,7 @@ KERNEL_FQ void m07100_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -329,7 +329,7 @@ KERNEL_FQ void m07100_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m07300_a0-optimized.cl b/OpenCL/m07300_a0-optimized.cl index 402f18fd5..72ad1b428 100644 --- a/OpenCL/m07300_a0-optimized.cl +++ b/OpenCL/m07300_a0-optimized.cl @@ -130,12 +130,12 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -155,13 +155,13 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t)) * salt */ - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -266,12 +266,12 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -291,7 +291,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) * salt */ - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * digest @@ -299,17 +299,17 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m07300_a0-pure.cl b/OpenCL/m07300_a0-pure.cl index bd816bc42..5abe0edc8 100644 --- a/OpenCL/m07300_a0-pure.cl +++ b/OpenCL/m07300_a0-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -54,7 +54,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t)) sha1_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&ctx); @@ -76,7 +76,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,10 +84,10 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,7 +100,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -110,7 +110,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t)) sha1_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&ctx); diff --git a/OpenCL/m07300_a1-optimized.cl b/OpenCL/m07300_a1-optimized.cl index b77899bed..5fd17fd6b 100644 --- a/OpenCL/m07300_a1-optimized.cl +++ b/OpenCL/m07300_a1-optimized.cl @@ -128,12 +128,12 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -153,13 +153,13 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) * salt */ - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -197,7 +197,7 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -332,12 +332,12 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -357,7 +357,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) * salt */ - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * digest @@ -365,17 +365,17 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -413,7 +413,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m07300_a1-pure.cl b/OpenCL/m07300_a1-pure.cl index 253be0230..636059b40 100644 --- a/OpenCL/m07300_a1-pure.cl +++ b/OpenCL/m07300_a1-pure.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -49,7 +49,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -77,7 +77,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) sha1_hmac_init (&ctx, c, pw_len + comb_len); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&ctx); @@ -99,7 +99,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -107,10 +107,10 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -130,7 +130,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -158,7 +158,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) sha1_hmac_init (&ctx, c, pw_len + comb_len); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&ctx); diff --git a/OpenCL/m07300_a3-optimized.cl b/OpenCL/m07300_a3-optimized.cl index aec06f89b..ebcae311c 100644 --- a/OpenCL/m07300_a3-optimized.cl +++ b/OpenCL/m07300_a3-optimized.cl @@ -123,7 +123,7 @@ DECLSPEC void m07300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * loop @@ -131,7 +131,7 @@ DECLSPEC void m07300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -233,7 +233,7 @@ DECLSPEC void m07300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * digest @@ -241,10 +241,10 @@ DECLSPEC void m07300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -253,7 +253,7 @@ DECLSPEC void m07300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -360,12 +360,12 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -405,7 +405,7 @@ KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) * main */ - m07300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_esalt_buf); + m07300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_esalt_buf); } KERNEL_FQ void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) @@ -426,12 +426,12 @@ KERNEL_FQ void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -471,7 +471,7 @@ KERNEL_FQ void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) * main */ - m07300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_esalt_buf); + m07300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_esalt_buf); } KERNEL_FQ void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) @@ -492,12 +492,12 @@ KERNEL_FQ void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -537,7 +537,7 @@ KERNEL_FQ void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) * main */ - m07300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_esalt_buf); + m07300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_esalt_buf); } KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) @@ -558,12 +558,12 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -603,7 +603,7 @@ KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) * main */ - m07300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_esalt_buf); + m07300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_esalt_buf); } KERNEL_FQ void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) @@ -624,12 +624,12 @@ KERNEL_FQ void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -669,7 +669,7 @@ KERNEL_FQ void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) * main */ - m07300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_esalt_buf); + m07300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_esalt_buf); } KERNEL_FQ void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) @@ -690,12 +690,12 @@ KERNEL_FQ void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) for (u32 i = lid; i < 128; i += lsz) { - s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -735,5 +735,5 @@ KERNEL_FQ void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) * main */ - m07300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, s_esalt_buf); + m07300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, s_esalt_buf); } diff --git a/OpenCL/m07300_a3-pure.cl b/OpenCL/m07300_a3-pure.cl index 66e507b06..006f6896e 100644 --- a/OpenCL/m07300_a3-pure.cl +++ b/OpenCL/m07300_a3-pure.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -51,7 +51,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -63,7 +63,7 @@ KERNEL_FQ void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) sha1_hmac_init (&ctx, w, pw_len); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&ctx); @@ -85,7 +85,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -93,10 +93,10 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -118,7 +118,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -130,7 +130,7 @@ KERNEL_FQ void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) sha1_hmac_init (&ctx, w, pw_len); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&ctx); diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl index 5fb83a2ad..26ec21bf6 100644 --- a/OpenCL/m07400-optimized.cl +++ b/OpenCL/m07400-optimized.cl @@ -1186,7 +1186,7 @@ KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1203,13 +1203,13 @@ KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); - const u32 salt_len = MIN (salt_bufs[SALT_POS].salt_len, 20); + const u32 salt_len = MIN (salt_bufs[SALT_POS_HOST].salt_len, 20); /** * buffers @@ -1534,7 +1534,7 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pw_len = MIN (pws[gid].pw_len, 15); @@ -1568,7 +1568,7 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) alt_result[6] = tmps[gid].alt_result[6]; alt_result[7] = tmps[gid].alt_result[7]; - const u32 salt_len = MIN (salt_bufs[SALT_POS].salt_len, 20); + const u32 salt_len = MIN (salt_bufs[SALT_POS_HOST].salt_len, 20); // just an optimization @@ -1584,7 +1584,7 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) /* Repeatedly run the collected hash value through SHA256 to burn CPU cycles. */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { u32 tmp[8]; @@ -1745,7 +1745,7 @@ KERNEL_FQ void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m07400-pure.cl b/OpenCL/m07400-pure.cl index 861cbceb7..3aacc0e4a 100644 --- a/OpenCL/m07400-pure.cl +++ b/OpenCL/m07400-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -52,13 +52,13 @@ KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) w[idx] = hc_swap32_S (w[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) @@ -269,11 +269,11 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pw_len = pws[gid].pw_len; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 alt_result[16] = { 0 }; @@ -289,7 +289,7 @@ KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) /* Repeatedly run the collected hash value through sha256 to burn CPU cycles. */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { sha256_ctx_t ctx; @@ -353,7 +353,7 @@ KERNEL_FQ void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl index a094df5dd..82b7d406f 100644 --- a/OpenCL/m07500_a0-optimized.cl +++ b/OpenCL/m07500_a0-optimized.cl @@ -287,7 +287,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -309,21 +309,21 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * shared @@ -335,7 +335,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -361,9 +361,9 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) if (decrypt_and_check (S, tmp, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -391,7 +391,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -413,21 +413,21 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * shared @@ -439,7 +439,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -465,9 +465,9 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) if (decrypt_and_check (S, tmp, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m07500_a0-pure.cl b/OpenCL/m07500_a0-pure.cl index 325e57160..5836e8c2d 100644 --- a/OpenCL/m07500_a0-pure.cl +++ b/OpenCL/m07500_a0-pure.cl @@ -166,7 +166,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -178,27 +178,27 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -218,9 +218,9 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) if (decrypt_and_check (S, digest, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -235,7 +235,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -247,27 +247,27 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -287,9 +287,9 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) if (decrypt_and_check (S, digest, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m07500_a1-optimized.cl b/OpenCL/m07500_a1-optimized.cl index 2ef9c573f..a51afb159 100644 --- a/OpenCL/m07500_a1-optimized.cl +++ b/OpenCL/m07500_a1-optimized.cl @@ -285,7 +285,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -307,21 +307,21 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * shared @@ -333,7 +333,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -371,7 +371,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -409,9 +409,9 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) if (decrypt_and_check (S, tmp, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -439,7 +439,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -461,21 +461,21 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * shared @@ -487,7 +487,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -525,7 +525,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -563,9 +563,9 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) if (decrypt_and_check (S, tmp, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m07500_a1-pure.cl b/OpenCL/m07500_a1-pure.cl index bc156d284..e63b2852a 100644 --- a/OpenCL/m07500_a1-pure.cl +++ b/OpenCL/m07500_a1-pure.cl @@ -164,7 +164,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -174,21 +174,21 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; md4_ctx_t ctx0; @@ -200,7 +200,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -214,9 +214,9 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) if (decrypt_and_check (S, digest, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -231,7 +231,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -241,21 +241,21 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; md4_ctx_t ctx0; @@ -267,7 +267,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -281,9 +281,9 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) if (decrypt_and_check (S, digest, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m07500_a3-optimized.cl b/OpenCL/m07500_a3-optimized.cl index c599eb168..b0715e255 100644 --- a/OpenCL/m07500_a3-optimized.cl +++ b/OpenCL/m07500_a3-optimized.cl @@ -286,21 +286,21 @@ DECLSPEC void m07500 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * loop @@ -308,7 +308,7 @@ DECLSPEC void m07500 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 w0l = w0[0]; - 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); @@ -353,9 +353,9 @@ DECLSPEC void m07500 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const if (decrypt_and_check (S, tmp, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -370,7 +370,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -408,7 +408,7 @@ KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) @@ -420,7 +420,7 @@ KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -458,7 +458,7 @@ KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07500_m16 (KERN_ATTR_ESALT (krb5pa_t)) @@ -474,7 +474,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -512,7 +512,7 @@ KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) @@ -524,7 +524,7 @@ KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -562,7 +562,7 @@ KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07500 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07500_s16 (KERN_ATTR_ESALT (krb5pa_t)) diff --git a/OpenCL/m07500_a3-pure.cl b/OpenCL/m07500_a3-pure.cl index cd8d18cda..293c8ac21 100644 --- a/OpenCL/m07500_a3-pure.cl +++ b/OpenCL/m07500_a3-pure.cl @@ -164,7 +164,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -172,10 +172,10 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -195,21 +195,21 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * loop @@ -217,7 +217,7 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -239,9 +239,9 @@ KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) if (decrypt_and_check (S, digest, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -256,7 +256,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -264,10 +264,10 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -287,21 +287,21 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; u32 timestamp_ct[8]; - timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET].timestamp[0]; - timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET].timestamp[1]; - timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET].timestamp[2]; - timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET].timestamp[3]; - timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET].timestamp[4]; - timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET].timestamp[5]; - timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET].timestamp[6]; - timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET].timestamp[7]; + timestamp_ct[0] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[0]; + timestamp_ct[1] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[1]; + timestamp_ct[2] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[2]; + timestamp_ct[3] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[3]; + timestamp_ct[4] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[4]; + timestamp_ct[5] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[5]; + timestamp_ct[6] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[6]; + timestamp_ct[7] = esalt_bufs[DIGESTS_OFFSET_HOST].timestamp[7]; /** * loop @@ -309,7 +309,7 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -331,9 +331,9 @@ KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) if (decrypt_and_check (S, digest, timestamp_ct) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl index 165691e6d..4c1d59630 100644 --- a/OpenCL/m07700_a0-optimized.cl +++ b/OpenCL/m07700_a0-optimized.cl @@ -169,7 +169,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -191,12 +191,12 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -206,7 +206,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -333,7 +333,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -355,12 +355,12 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -372,8 +372,8 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -382,7 +382,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m07700_a1-optimized.cl b/OpenCL/m07700_a1-optimized.cl index 77a3bb26a..7e6356d50 100644 --- a/OpenCL/m07700_a1-optimized.cl +++ b/OpenCL/m07700_a1-optimized.cl @@ -160,7 +160,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -182,12 +182,12 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -197,7 +197,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -235,7 +235,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -367,7 +367,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -389,12 +389,12 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -406,8 +406,8 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -416,7 +416,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -454,7 +454,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m07700_a3-optimized.cl b/OpenCL/m07700_a3-optimized.cl index e867cb070..cdefcb692 100644 --- a/OpenCL/m07700_a3-optimized.cl +++ b/OpenCL/m07700_a3-optimized.cl @@ -155,15 +155,15 @@ DECLSPEC void m07700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[3]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); salt_buf0[2] = sapb_trans (salt_buf0[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -199,7 +199,7 @@ DECLSPEC void m07700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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 = sapb_trans (ix_create_bft (bfs_buf, il_pos)); @@ -280,15 +280,15 @@ DECLSPEC void m07700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[3]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); salt_buf0[2] = sapb_trans (salt_buf0[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -324,8 +324,8 @@ DECLSPEC void m07700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -336,7 +336,7 @@ DECLSPEC void m07700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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 = sapb_trans (ix_create_bft (bfs_buf, il_pos)); @@ -407,7 +407,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -449,7 +449,7 @@ KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) * main */ - m07700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07700_m08 (KERN_ATTR_BASIC ()) @@ -460,7 +460,7 @@ KERNEL_FQ void m07700_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -502,7 +502,7 @@ KERNEL_FQ void m07700_m08 (KERN_ATTR_BASIC ()) * main */ - m07700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07700_m16 (KERN_ATTR_BASIC ()) @@ -517,7 +517,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -559,7 +559,7 @@ KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) * main */ - m07700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07700_s08 (KERN_ATTR_BASIC ()) @@ -570,7 +570,7 @@ KERNEL_FQ void m07700_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -612,7 +612,7 @@ KERNEL_FQ void m07700_s08 (KERN_ATTR_BASIC ()) * main */ - m07700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07700_s16 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m07701_a0-optimized.cl b/OpenCL/m07701_a0-optimized.cl index 55430df32..3794e4bec 100644 --- a/OpenCL/m07701_a0-optimized.cl +++ b/OpenCL/m07701_a0-optimized.cl @@ -162,7 +162,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -184,12 +184,12 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -199,7 +199,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -326,7 +326,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -348,12 +348,12 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -365,8 +365,8 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -375,7 +375,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m07701_a1-optimized.cl b/OpenCL/m07701_a1-optimized.cl index 425bb3a04..792edde2f 100644 --- a/OpenCL/m07701_a1-optimized.cl +++ b/OpenCL/m07701_a1-optimized.cl @@ -160,7 +160,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -182,12 +182,12 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -197,7 +197,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -235,7 +235,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -367,7 +367,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -389,12 +389,12 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); @@ -406,8 +406,8 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -416,7 +416,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -454,7 +454,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m07701_a3-optimized.cl b/OpenCL/m07701_a3-optimized.cl index 934c943f0..38be29474 100644 --- a/OpenCL/m07701_a3-optimized.cl +++ b/OpenCL/m07701_a3-optimized.cl @@ -155,15 +155,15 @@ DECLSPEC void m07701m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[3]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); salt_buf0[2] = sapb_trans (salt_buf0[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -199,7 +199,7 @@ DECLSPEC void m07701m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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 = sapb_trans (ix_create_bft (bfs_buf, il_pos)); @@ -280,15 +280,15 @@ DECLSPEC void m07701s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[3]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; salt_buf0[0] = sapb_trans (salt_buf0[0]); salt_buf0[1] = sapb_trans (salt_buf0[1]); salt_buf0[2] = sapb_trans (salt_buf0[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -324,8 +324,8 @@ DECLSPEC void m07701s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -336,7 +336,7 @@ DECLSPEC void m07701s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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 = sapb_trans (ix_create_bft (bfs_buf, il_pos)); @@ -407,7 +407,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -449,7 +449,7 @@ KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) * main */ - m07701m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07701m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07701_m08 (KERN_ATTR_BASIC ()) @@ -460,7 +460,7 @@ KERNEL_FQ void m07701_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -502,7 +502,7 @@ KERNEL_FQ void m07701_m08 (KERN_ATTR_BASIC ()) * main */ - m07701m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07701m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07701_m16 (KERN_ATTR_BASIC ()) @@ -517,7 +517,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -559,7 +559,7 @@ KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) * main */ - m07701s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07701s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07701_s08 (KERN_ATTR_BASIC ()) @@ -570,7 +570,7 @@ KERNEL_FQ void m07701_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -612,7 +612,7 @@ KERNEL_FQ void m07701_s08 (KERN_ATTR_BASIC ()) * main */ - m07701s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07701s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07701_s16 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl index 023ac8ac3..6174dc431 100644 --- a/OpenCL/m07800_a0-optimized.cl +++ b/OpenCL/m07800_a0-optimized.cl @@ -68,7 +68,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -90,22 +90,22 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_RULES ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -320,7 +320,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -342,16 +342,16 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_RULES ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -359,17 +359,17 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m07800_a1-optimized.cl b/OpenCL/m07800_a1-optimized.cl index 89bb92749..939ff8ba1 100644 --- a/OpenCL/m07800_a1-optimized.cl +++ b/OpenCL/m07800_a1-optimized.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -88,22 +88,22 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -141,7 +141,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -378,7 +378,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -400,16 +400,16 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -417,17 +417,17 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -465,7 +465,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m07800_a3-optimized.cl b/OpenCL/m07800_a3-optimized.cl index 71bc23077..d505b7a54 100644 --- a/OpenCL/m07800_a3-optimized.cl +++ b/OpenCL/m07800_a3-optimized.cl @@ -67,16 +67,16 @@ DECLSPEC void m07800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[8]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -110,7 +110,7 @@ DECLSPEC void m07800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -287,16 +287,16 @@ DECLSPEC void m07800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[8]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -330,10 +330,10 @@ DECLSPEC void m07800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -342,7 +342,7 @@ DECLSPEC void m07800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -512,7 +512,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -554,7 +554,7 @@ KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) * main */ - m07800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07800_m08 (KERN_ATTR_BASIC ()) @@ -565,7 +565,7 @@ KERNEL_FQ void m07800_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -607,7 +607,7 @@ KERNEL_FQ void m07800_m08 (KERN_ATTR_BASIC ()) * main */ - m07800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07800_m16 (KERN_ATTR_BASIC ()) @@ -622,7 +622,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -664,7 +664,7 @@ KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) * main */ - m07800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07800_s08 (KERN_ATTR_BASIC ()) @@ -675,7 +675,7 @@ KERNEL_FQ void m07800_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -717,7 +717,7 @@ KERNEL_FQ void m07800_s08 (KERN_ATTR_BASIC ()) * main */ - m07800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07800_s16 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m07801_a0-optimized.cl b/OpenCL/m07801_a0-optimized.cl index b8dbe05ab..aa06560bd 100644 --- a/OpenCL/m07801_a0-optimized.cl +++ b/OpenCL/m07801_a0-optimized.cl @@ -68,7 +68,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -90,22 +90,22 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_RULES ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -320,7 +320,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -342,16 +342,16 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_RULES ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -359,17 +359,17 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m07801_a1-optimized.cl b/OpenCL/m07801_a1-optimized.cl index ca30ad236..565735a59 100644 --- a/OpenCL/m07801_a1-optimized.cl +++ b/OpenCL/m07801_a1-optimized.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -88,22 +88,22 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -141,7 +141,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -378,7 +378,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -400,16 +400,16 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) u32 salt_buf[8]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf[5] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf[6] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf[7] = salt_bufs[SALT_POS].salt_buf[7]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf[5] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf[6] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf[7] = salt_bufs[SALT_POS_HOST].salt_buf[7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -417,17 +417,17 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -465,7 +465,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m07801_a3-optimized.cl b/OpenCL/m07801_a3-optimized.cl index 564c0daf9..a1053a123 100644 --- a/OpenCL/m07801_a3-optimized.cl +++ b/OpenCL/m07801_a3-optimized.cl @@ -67,16 +67,16 @@ DECLSPEC void m07801m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[8]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -110,7 +110,7 @@ DECLSPEC void m07801m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -287,16 +287,16 @@ DECLSPEC void m07801s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[8]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); - salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[5]); - salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[6]); - salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[7]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); + salt_buf[5] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[5]); + salt_buf[6] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[6]); + salt_buf[7] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[7]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s0[4]; u32 s1[4]; @@ -330,10 +330,10 @@ DECLSPEC void m07801s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -342,7 +342,7 @@ DECLSPEC void m07801s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -512,7 +512,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -554,7 +554,7 @@ KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) * main */ - m07801m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07801m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07801_m08 (KERN_ATTR_BASIC ()) @@ -565,7 +565,7 @@ KERNEL_FQ void m07801_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -607,7 +607,7 @@ KERNEL_FQ void m07801_m08 (KERN_ATTR_BASIC ()) * main */ - m07801m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07801m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07801_m16 (KERN_ATTR_BASIC ()) @@ -622,7 +622,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -664,7 +664,7 @@ KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) * main */ - m07801s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07801s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07801_s08 (KERN_ATTR_BASIC ()) @@ -675,7 +675,7 @@ KERNEL_FQ void m07801_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -717,7 +717,7 @@ KERNEL_FQ void m07801_s08 (KERN_ATTR_BASIC ()) * main */ - m07801s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m07801s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m07801_s16 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl index 3563d8d2d..e20ce4f02 100644 --- a/OpenCL/m07900-pure.cl +++ b/OpenCL/m07900-pure.cl @@ -28,13 +28,13 @@ KERNEL_FQ void m07900_init (KERN_ATTR_TMPS (drupal7_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t ctx; sha512_init (&ctx); - sha512_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -58,7 +58,7 @@ KERNEL_FQ void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -123,7 +123,7 @@ KERNEL_FQ void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) if ((64 + pw_len + 1) >= 112) { - for (u32 i = 1; i < loop_cnt; i++) + for (u32 i = 1; i < LOOP_CNT; i++) { sha512_init (&sha512_ctx); @@ -162,7 +162,7 @@ KERNEL_FQ void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) } else { - for (u32 i = 1; i < loop_cnt; i++) + for (u32 i = 1; i < LOOP_CNT; i++) { sha512_ctx.w0[0] = h32_from_64_S (digest[0]); sha512_ctx.w0[1] = l32_from_64_S (digest[0]); @@ -212,7 +212,7 @@ KERNEL_FQ void m07900_comp (KERN_ATTR_TMPS (drupal7_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl index 67bdf8d61..b7cf6b94c 100644 --- a/OpenCL/m08000_a0-optimized.cl +++ b/OpenCL/m08000_a0-optimized.cl @@ -232,9 +232,9 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); // 0x80 + const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); // 0x80 /** * precompute final msg blocks @@ -279,7 +279,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -303,7 +303,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -403,9 +403,9 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); // 0x80 + const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); // 0x80 /** * precompute final msg blocks @@ -450,7 +450,7 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -476,17 +476,17 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m08000_a1-optimized.cl b/OpenCL/m08000_a1-optimized.cl index 01c925243..4767fa0bc 100644 --- a/OpenCL/m08000_a1-optimized.cl +++ b/OpenCL/m08000_a1-optimized.cl @@ -230,9 +230,9 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); // 0x80 + const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); // 0x80 /** * precompute final msg blocks @@ -277,7 +277,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -301,7 +301,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -339,7 +339,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -455,9 +455,9 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); // 0x80 + const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); // 0x80 /** * precompute final msg blocks @@ -502,7 +502,7 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -528,17 +528,17 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -576,7 +576,7 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08000_a3-optimized.cl b/OpenCL/m08000_a3-optimized.cl index 14ee12d12..390e4d235 100644 --- a/OpenCL/m08000_a3-optimized.cl +++ b/OpenCL/m08000_a3-optimized.cl @@ -230,9 +230,9 @@ DECLSPEC void m08000m (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 * salt */ - const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); // 0x80 + const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); // 0x80 /** * precompute final msg blocks @@ -274,7 +274,7 @@ DECLSPEC void m08000m (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -305,7 +305,7 @@ DECLSPEC void m08000m (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -352,9 +352,9 @@ DECLSPEC void m08000s (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 * salt */ - const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); // 0x80 + const u32 salt_buf0 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + const u32 salt_buf1 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + const u32 salt_buf2 = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); // 0x80 /** * precompute final msg blocks @@ -396,7 +396,7 @@ DECLSPEC void m08000s (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -427,10 +427,10 @@ DECLSPEC void m08000s (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -439,7 +439,7 @@ DECLSPEC void m08000s (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -508,7 +508,7 @@ KERNEL_FQ void m08000_m04 (KERN_ATTR_VECTOR ()) * main */ - m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08000_m08 (KERN_ATTR_VECTOR ()) @@ -547,7 +547,7 @@ KERNEL_FQ void m08000_m08 (KERN_ATTR_VECTOR ()) * main */ - m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08000_m16 (KERN_ATTR_VECTOR ()) @@ -586,7 +586,7 @@ KERNEL_FQ void m08000_m16 (KERN_ATTR_VECTOR ()) * main */ - m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08000_s04 (KERN_ATTR_VECTOR ()) @@ -625,7 +625,7 @@ KERNEL_FQ void m08000_s04 (KERN_ATTR_VECTOR ()) * main */ - m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08000_s08 (KERN_ATTR_VECTOR ()) @@ -664,7 +664,7 @@ KERNEL_FQ void m08000_s08 (KERN_ATTR_VECTOR ()) * main */ - m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08000_s16 (KERN_ATTR_VECTOR ()) @@ -703,5 +703,5 @@ KERNEL_FQ void m08000_s16 (KERN_ATTR_VECTOR ()) * main */ - m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m08100_a0-optimized.cl b/OpenCL/m08100_a0-optimized.cl index 1173405bd..b89ded3e8 100644 --- a/OpenCL/m08100_a0-optimized.cl +++ b/OpenCL/m08100_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -52,16 +52,16 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -242,7 +242,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -264,10 +264,10 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -275,10 +275,10 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -291,7 +291,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m08100_a0-pure.cl b/OpenCL/m08100_a0-pure.cl index 93bd8b4c5..babe4f199 100644 --- a/OpenCL/m08100_a0-pure.cl +++ b/OpenCL/m08100_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,13 +39,13 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -77,7 +77,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -85,10 +85,10 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -103,13 +103,13 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m08100_a1-optimized.cl b/OpenCL/m08100_a1-optimized.cl index 7e1407f65..5d4aa05be 100644 --- a/OpenCL/m08100_a1-optimized.cl +++ b/OpenCL/m08100_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,10 +50,10 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -61,17 +61,17 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -109,7 +109,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -311,7 +311,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -333,10 +333,10 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -344,10 +344,10 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -360,7 +360,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -398,7 +398,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08100_a1-pure.cl b/OpenCL/m08100_a1-pure.cl index 9fabe00bb..a374c084e 100644 --- a/OpenCL/m08100_a1-pure.cl +++ b/OpenCL/m08100_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -35,7 +35,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -43,7 +43,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -72,7 +72,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -80,10 +80,10 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -96,7 +96,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -104,7 +104,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m08100_a3-optimized.cl b/OpenCL/m08100_a3-optimized.cl index 37d413f93..fb5e13805 100644 --- a/OpenCL/m08100_a3-optimized.cl +++ b/OpenCL/m08100_a3-optimized.cl @@ -29,10 +29,10 @@ DECLSPEC void m08100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -42,7 +42,7 @@ DECLSPEC void m08100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -190,10 +190,10 @@ DECLSPEC void m08100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -203,10 +203,10 @@ DECLSPEC void m08100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -221,7 +221,7 @@ DECLSPEC void m08100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -365,7 +365,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -418,7 +418,7 @@ KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) * main */ - m08100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08100_m08 (KERN_ATTR_BASIC ()) @@ -429,7 +429,7 @@ KERNEL_FQ void m08100_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -490,7 +490,7 @@ KERNEL_FQ void m08100_m08 (KERN_ATTR_BASIC ()) * main */ - m08100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08100_m16 (KERN_ATTR_BASIC ()) @@ -501,7 +501,7 @@ KERNEL_FQ void m08100_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -577,7 +577,7 @@ KERNEL_FQ void m08100_m16 (KERN_ATTR_BASIC ()) * main */ - m08100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) @@ -588,7 +588,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -641,7 +641,7 @@ KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) * main */ - m08100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08100_s08 (KERN_ATTR_BASIC ()) @@ -652,7 +652,7 @@ KERNEL_FQ void m08100_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -713,7 +713,7 @@ KERNEL_FQ void m08100_s08 (KERN_ATTR_BASIC ()) * main */ - m08100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08100_s16 (KERN_ATTR_BASIC ()) @@ -724,7 +724,7 @@ KERNEL_FQ void m08100_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -800,5 +800,5 @@ KERNEL_FQ void m08100_s16 (KERN_ATTR_BASIC ()) * main */ - m08100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m08100_a3-pure.cl b/OpenCL/m08100_a3-pure.cl index 13d9eecc5..8a2a8edc5 100644 --- a/OpenCL/m08100_a3-pure.cl +++ b/OpenCL/m08100_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -52,7 +52,7 @@ KERNEL_FQ void m08100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -88,7 +88,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -96,10 +96,10 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -121,7 +121,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -129,7 +129,7 @@ KERNEL_FQ void m08100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m08200-pure.cl b/OpenCL/m08200-pure.cl index b80368fef..cd1cc3b46 100644 --- a/OpenCL/m08200-pure.cl +++ b/OpenCL/m08200-pure.cl @@ -101,7 +101,7 @@ KERNEL_FQ void m08200_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -125,7 +125,7 @@ KERNEL_FQ void m08200_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_ tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -201,7 +201,7 @@ KERNEL_FQ void m08200_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -247,7 +247,7 @@ KERNEL_FQ void m08200_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_ out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -331,7 +331,7 @@ KERNEL_FQ void m08200_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -361,7 +361,7 @@ KERNEL_FQ void m08200_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_ sha256_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha256_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].data_buf, esalt_bufs[DIGESTS_OFFSET].data_len); + sha256_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].data_buf, esalt_bufs[DIGESTS_OFFSET_HOST].data_len); sha256_hmac_final (&ctx); diff --git a/OpenCL/m08300_a0-optimized.cl b/OpenCL/m08300_a0-optimized.cl index 32476fae3..20cf16fa7 100644 --- a/OpenCL/m08300_a0-optimized.cl +++ b/OpenCL/m08300_a0-optimized.cl @@ -187,7 +187,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -207,41 +207,41 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 domain_buf0[4]; u32 domain_buf1[4]; - domain_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[ 0]; - domain_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[ 1]; - domain_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[ 2]; - domain_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[ 3]; - domain_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[ 4]; - domain_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[ 5]; - domain_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[ 6]; + domain_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 0]; + domain_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 1]; + domain_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 2]; + domain_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 3]; + domain_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 4]; + domain_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 5]; + domain_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 6]; domain_buf1[3] = 0; - const u32 domain_len = salt_bufs[SALT_POS].salt_len_pc; + const u32 domain_len = salt_bufs[SALT_POS_HOST].salt_len_pc; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -479,7 +479,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -499,35 +499,35 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 domain_buf0[4]; u32 domain_buf1[4]; - domain_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[ 0]; - domain_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[ 1]; - domain_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[ 2]; - domain_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[ 3]; - domain_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[ 4]; - domain_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[ 5]; - domain_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[ 6]; + domain_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 0]; + domain_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 1]; + domain_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 2]; + domain_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 3]; + domain_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 4]; + domain_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 5]; + domain_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 6]; domain_buf1[3] = 0; - const u32 domain_len = salt_bufs[SALT_POS].salt_len_pc; + const u32 domain_len = salt_bufs[SALT_POS_HOST].salt_len_pc; /** * digest @@ -535,17 +535,17 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m08300_a0-pure.cl b/OpenCL/m08300_a0-pure.cl index 22bf13f07..12bdc253e 100644 --- a/OpenCL/m08300_a0-pure.cl +++ b/OpenCL/m08300_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,31 +33,31 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } - const u32 salt_len_pc = salt_bufs[SALT_POS].salt_len_pc; + const u32 salt_len_pc = salt_bufs[SALT_POS_HOST].salt_len_pc; u32 s_pc[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len_pc; i += 4, idx += 1) { - s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[idx]); + s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]); } - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -157,7 +157,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -165,10 +165,10 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -177,31 +177,31 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } - const u32 salt_len_pc = salt_bufs[SALT_POS].salt_len_pc; + const u32 salt_len_pc = salt_bufs[SALT_POS_HOST].salt_len_pc; u32 s_pc[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len_pc; i += 4, idx += 1) { - s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[idx]); + s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]); } - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m08300_a1-optimized.cl b/OpenCL/m08300_a1-optimized.cl index ba093e4bc..a9da3e76e 100644 --- a/OpenCL/m08300_a1-optimized.cl +++ b/OpenCL/m08300_a1-optimized.cl @@ -185,7 +185,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -205,41 +205,41 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 domain_buf0[4]; u32 domain_buf1[4]; - domain_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[ 0]; - domain_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[ 1]; - domain_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[ 2]; - domain_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[ 3]; - domain_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[ 4]; - domain_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[ 5]; - domain_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[ 6]; + domain_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 0]; + domain_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 1]; + domain_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 2]; + domain_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 3]; + domain_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 4]; + domain_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 5]; + domain_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 6]; domain_buf1[3] = 0; - const u32 domain_len = salt_bufs[SALT_POS].salt_len_pc; + const u32 domain_len = salt_bufs[SALT_POS_HOST].salt_len_pc; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -277,7 +277,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -537,7 +537,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -557,35 +557,35 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 domain_buf0[4]; u32 domain_buf1[4]; - domain_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[ 0]; - domain_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[ 1]; - domain_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[ 2]; - domain_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[ 3]; - domain_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[ 4]; - domain_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[ 5]; - domain_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[ 6]; + domain_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 0]; + domain_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 1]; + domain_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 2]; + domain_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 3]; + domain_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 4]; + domain_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 5]; + domain_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[ 6]; domain_buf1[3] = 0; - const u32 domain_len = salt_bufs[SALT_POS].salt_len_pc; + const u32 domain_len = salt_bufs[SALT_POS_HOST].salt_len_pc; /** * digest @@ -593,17 +593,17 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -641,7 +641,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08300_a1-pure.cl b/OpenCL/m08300_a1-pure.cl index 6121ef370..a1632007a 100644 --- a/OpenCL/m08300_a1-pure.cl +++ b/OpenCL/m08300_a1-pure.cl @@ -59,37 +59,37 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } - const u32 salt_len_pc = salt_bufs[SALT_POS].salt_len_pc; + const u32 salt_len_pc = salt_bufs[SALT_POS_HOST].salt_len_pc; u32 s_pc[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len_pc; i += 4, idx += 1) { - s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[idx]); + s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]); } - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1; @@ -176,7 +176,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -184,41 +184,41 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } - const u32 salt_len_pc = salt_bufs[SALT_POS].salt_len_pc; + const u32 salt_len_pc = salt_bufs[SALT_POS_HOST].salt_len_pc; u32 s_pc[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len_pc; i += 4, idx += 1) { - s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[idx]); + s_pc[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]); } - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1; diff --git a/OpenCL/m08300_a3-optimized.cl b/OpenCL/m08300_a3-optimized.cl index 1c9dee828..d835c0454 100644 --- a/OpenCL/m08300_a3-optimized.cl +++ b/OpenCL/m08300_a3-optimized.cl @@ -180,35 +180,35 @@ DECLSPEC void m08300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 domain_buf0[4]; u32 domain_buf1[4]; - domain_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 0]); - domain_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 1]); - domain_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 2]); - domain_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 3]); - domain_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 4]); - domain_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 5]); - domain_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 6]); + domain_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 0]); + domain_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 1]); + domain_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 2]); + domain_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 3]); + domain_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 4]); + domain_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 5]); + domain_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 6]); domain_buf1[3] = 0; - const u32 domain_len = salt_bufs[SALT_POS].salt_len_pc; + const u32 domain_len = salt_bufs[SALT_POS_HOST].salt_len_pc; u32 s0[4]; u32 s1[4]; @@ -293,7 +293,7 @@ DECLSPEC void m08300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,35 +419,35 @@ DECLSPEC void m08300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 domain_buf0[4]; u32 domain_buf1[4]; - domain_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 0]); - domain_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 1]); - domain_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 2]); - domain_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 3]); - domain_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 4]); - domain_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 5]); - domain_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf_pc[ 6]); + domain_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 0]); + domain_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 1]); + domain_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 2]); + domain_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 3]); + domain_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 4]); + domain_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 5]); + domain_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf_pc[ 6]); domain_buf1[3] = 0; - const u32 domain_len = salt_bufs[SALT_POS].salt_len_pc; + const u32 domain_len = salt_bufs[SALT_POS_HOST].salt_len_pc; u32 s0[4]; u32 s1[4]; @@ -532,10 +532,10 @@ DECLSPEC void m08300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -544,7 +544,7 @@ DECLSPEC void m08300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -665,7 +665,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -701,7 +701,7 @@ KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) * main */ - m08300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08300_m08 (KERN_ATTR_BASIC ()) @@ -712,7 +712,7 @@ KERNEL_FQ void m08300_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -748,7 +748,7 @@ KERNEL_FQ void m08300_m08 (KERN_ATTR_BASIC ()) * main */ - m08300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08300_m16 (KERN_ATTR_BASIC ()) @@ -759,7 +759,7 @@ KERNEL_FQ void m08300_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -795,7 +795,7 @@ KERNEL_FQ void m08300_m16 (KERN_ATTR_BASIC ()) * main */ - m08300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) @@ -806,7 +806,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -842,7 +842,7 @@ KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) * main */ - m08300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08300_s08 (KERN_ATTR_BASIC ()) @@ -853,7 +853,7 @@ KERNEL_FQ void m08300_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -889,7 +889,7 @@ KERNEL_FQ void m08300_s08 (KERN_ATTR_BASIC ()) * main */ - m08300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08300_s16 (KERN_ATTR_BASIC ()) @@ -900,7 +900,7 @@ KERNEL_FQ void m08300_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -936,5 +936,5 @@ KERNEL_FQ void m08300_s16 (KERN_ATTR_BASIC ()) * main */ - m08300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m08300_a3-pure.cl b/OpenCL/m08300_a3-pure.cl index 0e157d02b..c70908391 100644 --- a/OpenCL/m08300_a3-pure.cl +++ b/OpenCL/m08300_a3-pure.cl @@ -34,7 +34,7 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -49,25 +49,25 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } - const u32 salt_len_pc = salt_bufs[SALT_POS].salt_len_pc; + const u32 salt_len_pc = salt_bufs[SALT_POS_HOST].salt_len_pc; u32x s_pc[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len_pc; i += 4, idx += 1) { - s_pc[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf_pc[idx]); + s_pc[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]); } - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; /** * loop @@ -75,7 +75,7 @@ KERNEL_FQ void m08300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -207,7 +207,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -215,10 +215,10 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -234,25 +234,25 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } - const u32 salt_len_pc = salt_bufs[SALT_POS].salt_len_pc; + const u32 salt_len_pc = salt_bufs[SALT_POS_HOST].salt_len_pc; u32x s_pc[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len_pc; i += 4, idx += 1) { - s_pc[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf_pc[idx]); + s_pc[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf_pc[idx]); } - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; /** * loop @@ -260,7 +260,7 @@ KERNEL_FQ void m08300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m08400_a0-optimized.cl b/OpenCL/m08400_a0-optimized.cl index 1136ea98a..87f826c4f 100644 --- a/OpenCL/m08400_a0-optimized.cl +++ b/OpenCL/m08400_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -83,26 +83,26 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_RULES ()) u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -309,7 +309,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -337,20 +337,20 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_RULES ()) u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -358,17 +358,17 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m08400_a0-pure.cl b/OpenCL/m08400_a0-pure.cl index 05a6b46a8..a992894f4 100644 --- a/OpenCL/m08400_a0-pure.cl +++ b/OpenCL/m08400_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -206,7 +206,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -214,10 +214,10 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -230,13 +230,13 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m08400_a1-optimized.cl b/OpenCL/m08400_a1-optimized.cl index 854c20c74..c14f8cc27 100644 --- a/OpenCL/m08400_a1-optimized.cl +++ b/OpenCL/m08400_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -81,26 +81,26 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -138,7 +138,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -365,7 +365,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -393,20 +393,20 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -414,17 +414,17 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -462,7 +462,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08400_a1-pure.cl b/OpenCL/m08400_a1-pure.cl index d5d16e165..d95eb15f2 100644 --- a/OpenCL/m08400_a1-pure.cl +++ b/OpenCL/m08400_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,7 +63,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -75,7 +75,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; @@ -202,7 +202,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -210,10 +210,10 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -224,7 +224,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -236,7 +236,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; diff --git a/OpenCL/m08400_a3-optimized.cl b/OpenCL/m08400_a3-optimized.cl index 3bc0f21f0..21cabe9a2 100644 --- a/OpenCL/m08400_a3-optimized.cl +++ b/OpenCL/m08400_a3-optimized.cl @@ -43,20 +43,20 @@ DECLSPEC void m08400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -64,7 +64,7 @@ DECLSPEC void m08400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -253,20 +253,20 @@ DECLSPEC void m08400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -274,10 +274,10 @@ DECLSPEC void m08400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -286,7 +286,7 @@ DECLSPEC void m08400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -485,7 +485,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -525,7 +525,7 @@ KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) * main */ - m08400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m08400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m08400_m08 (KERN_ATTR_BASIC ()) @@ -555,7 +555,7 @@ KERNEL_FQ void m08400_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -595,7 +595,7 @@ KERNEL_FQ void m08400_m08 (KERN_ATTR_BASIC ()) * main */ - m08400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m08400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m08400_m16 (KERN_ATTR_BASIC ()) @@ -625,7 +625,7 @@ KERNEL_FQ void m08400_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -665,7 +665,7 @@ KERNEL_FQ void m08400_m16 (KERN_ATTR_BASIC ()) * main */ - m08400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m08400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) @@ -695,7 +695,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -735,7 +735,7 @@ KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) * main */ - m08400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m08400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m08400_s08 (KERN_ATTR_BASIC ()) @@ -765,7 +765,7 @@ KERNEL_FQ void m08400_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -805,7 +805,7 @@ KERNEL_FQ void m08400_s08 (KERN_ATTR_BASIC ()) * main */ - m08400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m08400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m08400_s16 (KERN_ATTR_BASIC ()) @@ -835,7 +835,7 @@ KERNEL_FQ void m08400_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -875,5 +875,5 @@ KERNEL_FQ void m08400_s16 (KERN_ATTR_BASIC ()) * main */ - m08400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m08400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m08400_a3-pure.cl b/OpenCL/m08400_a3-pure.cl index 1797a78af..12a2cbbc0 100644 --- a/OpenCL/m08400_a3-pure.cl +++ b/OpenCL/m08400_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -72,7 +72,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -80,7 +80,7 @@ KERNEL_FQ void m08400_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -219,7 +219,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -227,10 +227,10 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -250,7 +250,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -258,7 +258,7 @@ KERNEL_FQ void m08400_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m08500_a0-pure.cl b/OpenCL/m08500_a0-pure.cl index 852b9756f..b3aea26dc 100644 --- a/OpenCL/m08500_a0-pure.cl +++ b/OpenCL/m08500_a0-pure.cl @@ -562,7 +562,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -576,14 +576,14 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * main */ - 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) { pw_t tmp = PASTE_PW; @@ -660,7 +660,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -674,8 +674,8 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -683,8 +683,8 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -693,7 +693,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_RULES ()) * main */ - 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) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m08500_a1-pure.cl b/OpenCL/m08500_a1-pure.cl index 24dd5b61e..ee662557e 100644 --- a/OpenCL/m08500_a1-pure.cl +++ b/OpenCL/m08500_a1-pure.cl @@ -560,7 +560,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -586,14 +586,14 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -631,7 +631,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -716,7 +716,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -742,8 +742,8 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -751,8 +751,8 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -761,7 +761,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -799,7 +799,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08500_a3-pure.cl b/OpenCL/m08500_a3-pure.cl index 465b12481..24983357a 100644 --- a/OpenCL/m08500_a3-pure.cl +++ b/OpenCL/m08500_a3-pure.cl @@ -535,8 +535,8 @@ DECLSPEC void m08500m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * loop @@ -546,7 +546,7 @@ DECLSPEC void m08500m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 w1 = w[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 = words_buf_r[il_pos / VECT_SIZE]; @@ -598,8 +598,8 @@ DECLSPEC void m08500s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -607,8 +607,8 @@ DECLSPEC void m08500s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -621,7 +621,7 @@ DECLSPEC void m08500s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 w1 = w[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 = words_buf_r[il_pos / VECT_SIZE]; @@ -698,7 +698,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -729,7 +729,7 @@ KERNEL_FQ void m08500_mxx (KERN_ATTR_VECTOR ()) * main */ - m08500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08500_sxx (KERN_ATTR_VECTOR ()) @@ -772,7 +772,7 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -803,5 +803,5 @@ KERNEL_FQ void m08500_sxx (KERN_ATTR_VECTOR ()) * main */ - m08500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m08600_a0-pure.cl b/OpenCL/m08600_a0-pure.cl index 989ec6b52..78fb5bcf3 100644 --- a/OpenCL/m08600_a0-pure.cl +++ b/OpenCL/m08600_a0-pure.cl @@ -288,7 +288,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -300,7 +300,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_RULES ()) * loop */ - 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) { pw_t tmp = PASTE_PW; @@ -352,7 +352,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -366,17 +366,17 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m08600_a1-pure.cl b/OpenCL/m08600_a1-pure.cl index 10e0b42e8..60144e77e 100644 --- a/OpenCL/m08600_a1-pure.cl +++ b/OpenCL/m08600_a1-pure.cl @@ -286,7 +286,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -310,7 +310,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -348,7 +348,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -410,7 +410,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -436,17 +436,17 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -484,7 +484,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08600_a3-pure.cl b/OpenCL/m08600_a3-pure.cl index 9f24e4640..e53c1329d 100644 --- a/OpenCL/m08600_a3-pure.cl +++ b/OpenCL/m08600_a3-pure.cl @@ -283,7 +283,7 @@ DECLSPEC void m08600m (LOCAL_AS u32 *s_lotus_magic_table, u32 *w, const u32 pw_l u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -330,10 +330,10 @@ DECLSPEC void m08600s (LOCAL_AS u32 *s_lotus_magic_table, u32 *w, const u32 pw_l const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -342,7 +342,7 @@ DECLSPEC void m08600s (LOCAL_AS u32 *s_lotus_magic_table, u32 *w, const u32 pw_l u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -391,7 +391,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -422,7 +422,7 @@ KERNEL_FQ void m08600_mxx (KERN_ATTR_VECTOR ()) * main */ - m08600m (s_lotus_magic_table, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08600m (s_lotus_magic_table, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08600_sxx (KERN_ATTR_VECTOR ()) @@ -448,7 +448,7 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -479,5 +479,5 @@ KERNEL_FQ void m08600_sxx (KERN_ATTR_VECTOR ()) * main */ - m08600s (s_lotus_magic_table, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08600s (s_lotus_magic_table, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl index d78f517a2..8b9a82f15 100644 --- a/OpenCL/m08700_a0-optimized.cl +++ b/OpenCL/m08700_a0-optimized.cl @@ -336,7 +336,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -360,14 +360,14 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 salt1 = (salt_bufs[SALT_POS].salt_buf[1] & 0xff) | '(' << 8; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 salt1 = (salt_bufs[SALT_POS_HOST].salt_buf[1] & 0xff) | '(' << 8; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -523,7 +523,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -547,8 +547,8 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 salt1 = (salt_bufs[SALT_POS].salt_buf[1] & 0xff) | '(' << 8; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 salt1 = (salt_bufs[SALT_POS_HOST].salt_buf[1] & 0xff) | '(' << 8; /** * digest @@ -556,17 +556,17 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m08700_a1-optimized.cl b/OpenCL/m08700_a1-optimized.cl index d5b40d7f7..0090ea2bb 100644 --- a/OpenCL/m08700_a1-optimized.cl +++ b/OpenCL/m08700_a1-optimized.cl @@ -334,7 +334,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -358,14 +358,14 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 salt1 = (salt_bufs[SALT_POS].salt_buf[1] & 0xff) | '(' << 8; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 salt1 = (salt_bufs[SALT_POS_HOST].salt_buf[1] & 0xff) | '(' << 8; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -403,7 +403,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -581,7 +581,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -605,8 +605,8 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 salt1 = (salt_bufs[SALT_POS].salt_buf[1] & 0xff) | '(' << 8; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 salt1 = (salt_bufs[SALT_POS_HOST].salt_buf[1] & 0xff) | '(' << 8; /** * digest @@ -614,17 +614,17 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -662,7 +662,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m08700_a3-optimized.cl b/OpenCL/m08700_a3-optimized.cl index c09fa2eae..49d81f2ab 100644 --- a/OpenCL/m08700_a3-optimized.cl +++ b/OpenCL/m08700_a3-optimized.cl @@ -335,8 +335,8 @@ DECLSPEC void m08700m (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2as * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 salt1 = (salt_bufs[SALT_POS].salt_buf[1] & 0xff) | '(' << 8; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 salt1 = (salt_bufs[SALT_POS_HOST].salt_buf[1] & 0xff) | '(' << 8; /** * loop @@ -344,7 +344,7 @@ DECLSPEC void m08700m (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2as u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -468,8 +468,8 @@ DECLSPEC void m08700s (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2as * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 salt1 = (salt_bufs[SALT_POS].salt_buf[1] & 0xff) | '(' << 8; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 salt1 = (salt_bufs[SALT_POS_HOST].salt_buf[1] & 0xff) | '(' << 8; /** * digest @@ -477,10 +477,10 @@ DECLSPEC void m08700s (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2as const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -489,7 +489,7 @@ DECLSPEC void m08700s (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2as u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -613,7 +613,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -644,7 +644,7 @@ KERNEL_FQ void m08700_m04 (KERN_ATTR_VECTOR ()) * main */ - m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08700_m08 (KERN_ATTR_VECTOR ()) @@ -681,7 +681,7 @@ KERNEL_FQ void m08700_m08 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -712,7 +712,7 @@ KERNEL_FQ void m08700_m08 (KERN_ATTR_VECTOR ()) * main */ - m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08700_m16 (KERN_ATTR_VECTOR ()) @@ -749,7 +749,7 @@ KERNEL_FQ void m08700_m16 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -780,7 +780,7 @@ KERNEL_FQ void m08700_m16 (KERN_ATTR_VECTOR ()) * main */ - m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08700_s04 (KERN_ATTR_VECTOR ()) @@ -817,7 +817,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -848,7 +848,7 @@ KERNEL_FQ void m08700_s04 (KERN_ATTR_VECTOR ()) * main */ - m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08700_s08 (KERN_ATTR_VECTOR ()) @@ -885,7 +885,7 @@ KERNEL_FQ void m08700_s08 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -916,7 +916,7 @@ KERNEL_FQ void m08700_s08 (KERN_ATTR_VECTOR ()) * main */ - m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m08700_s16 (KERN_ATTR_VECTOR ()) @@ -953,7 +953,7 @@ KERNEL_FQ void m08700_s16 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -984,5 +984,5 @@ KERNEL_FQ void m08700_s16 (KERN_ATTR_VECTOR ()) * main */ - m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m08800-pure.cl b/OpenCL/m08800-pure.cl index 18773c92d..39e466e2e 100644 --- a/OpenCL/m08800-pure.cl +++ b/OpenCL/m08800-pure.cl @@ -76,7 +76,7 @@ KERNEL_FQ void m08800_init (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -94,7 +94,7 @@ KERNEL_FQ void m08800_init (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -144,7 +144,7 @@ KERNEL_FQ void m08800_loop (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -178,7 +178,7 @@ KERNEL_FQ void m08800_loop (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -282,7 +282,7 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -303,10 +303,10 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t u32 data[4]; - data[0] = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - data[1] = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - data[2] = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - data[3] = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + data[0] = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + data[1] = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + data[2] = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + data[3] = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; u32 out[4]; @@ -383,10 +383,10 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t // 3. decrypt real data, xor essiv afterwards - data[0] = esalt_bufs[DIGESTS_OFFSET].data[0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[3]; iv[0] = essiv[0]; iv[1] = essiv[1]; @@ -415,9 +415,9 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t // MSDOS5.0 if ((r0 == 0x4f44534d) && (r1 == 0x302e3553)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } @@ -445,15 +445,15 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t for (u32 i = 4; i < 16; i += 4) { - data[0] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 3]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 0 - 4]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 1 - 4]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 2 - 4]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[256 + i + 3 - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 0 - 4]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 1 - 4]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 2 - 4]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[256 + i + 3 - 4]; AES128_decrypt (ks, data, out, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -474,9 +474,9 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t if ((r[5] < 2) && (r[6] < 16) && ((r[14] & 0xffff) == 0xEF53)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m08900-pure.cl b/OpenCL/m08900-pure.cl index 74f8a0e66..6f9821b59 100644 --- a/OpenCL/m08900-pure.cl +++ b/OpenCL/m08900-pure.cl @@ -254,13 +254,13 @@ KERNEL_FQ void m08900_init (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; sha256_hmac_init_global_swap (&sha256_hmac_ctx, pws[gid].i, pws[gid].pw_len); - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1, k = 0; i < SCRYPT_CNT; i += 8, j += 1, k += 2) { @@ -359,7 +359,7 @@ KERNEL_FQ void m08900_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // SCRYPT part, init V @@ -370,7 +370,7 @@ KERNEL_FQ void m08900_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -386,7 +386,7 @@ KERNEL_FQ void m08900_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf; GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf; @@ -395,7 +395,7 @@ KERNEL_FQ void m08900_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -415,7 +415,7 @@ KERNEL_FQ void m08900_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * 2nd pbkdf2, creates B diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl index 323cf8387..99f9206e3 100644 --- a/OpenCL/m09000-pure.cl +++ b/OpenCL/m09000-pure.cl @@ -415,7 +415,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m09000_init (KERN_ATTR_TMPS const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -453,12 +453,12 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m09000_init (KERN_ATTR_TMPS * salt */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; /** * initial sha1 @@ -644,7 +644,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m09000_loop (KERN_ATTR_TMPS const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -696,7 +696,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m09000_loop (KERN_ATTR_TMPS u32 L0 = digest[0]; u32 R0 = digest[1]; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { BF_ENCRYPT (L0, R0); } @@ -713,7 +713,7 @@ KERNEL_FQ void m09000_comp (KERN_ATTR_TMPS (pwsafe2_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m09100-pure.cl b/OpenCL/m09100-pure.cl index 83de82773..dd63b1226 100644 --- a/OpenCL/m09100-pure.cl +++ b/OpenCL/m09100-pure.cl @@ -464,7 +464,7 @@ KERNEL_FQ void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -518,10 +518,10 @@ KERNEL_FQ void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; const u32 salt0 = salt_buf0[0]; const u32 salt1 = (salt_buf0[1] & 0xff) | ('(' << 8); @@ -655,7 +655,7 @@ KERNEL_FQ void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 2; i += 5, j += 1) { @@ -700,7 +700,7 @@ KERNEL_FQ void m09100_loop (KERN_ATTR_TMPS (lotus8_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -734,7 +734,7 @@ KERNEL_FQ void m09100_loop (KERN_ATTR_TMPS (lotus8_tmp_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -789,7 +789,7 @@ KERNEL_FQ void m09100_comp (KERN_ATTR_TMPS (lotus8_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m09400-pure.cl b/OpenCL/m09400-pure.cl index fef3cfd6c..5634e5be4 100644 --- a/OpenCL/m09400-pure.cl +++ b/OpenCL/m09400-pure.cl @@ -41,13 +41,13 @@ KERNEL_FQ void m09400_init (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t ctx; sha1_init (&ctx); - sha1_update_global (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_utf16le_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -64,7 +64,7 @@ KERNEL_FQ void m09400_loop (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x t0 = packv (tmps, out, gid, 0); u32x t1 = packv (tmps, out, gid, 1); @@ -94,7 +94,7 @@ KERNEL_FQ void m09400_loop (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t w3[2] = 0; w3[3] = (4 + 20) * 8; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { w0[0] = hc_swap32 (j); w0[1] = t0; @@ -184,7 +184,7 @@ KERNEL_FQ void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -274,10 +274,10 @@ KERNEL_FQ void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t u32 verifier[4]; - verifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - verifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - verifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - verifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + verifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + verifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + verifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + verifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; u32 data[4]; diff --git a/OpenCL/m09500-pure.cl b/OpenCL/m09500-pure.cl index 92f2f88d3..45b8de2fa 100644 --- a/OpenCL/m09500-pure.cl +++ b/OpenCL/m09500-pure.cl @@ -39,13 +39,13 @@ KERNEL_FQ void m09500_init (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t ctx; sha1_init (&ctx); - sha1_update_global (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_utf16le_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -62,7 +62,7 @@ KERNEL_FQ void m09500_loop (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x t0 = packv (tmps, out, gid, 0); u32x t1 = packv (tmps, out, gid, 1); @@ -92,7 +92,7 @@ KERNEL_FQ void m09500_loop (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t w3[2] = 0; w3[3] = (4 + 20) * 8; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { w0[0] = hc_swap32 (j); w0[1] = t0; @@ -182,7 +182,7 @@ KERNEL_FQ void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -271,7 +271,7 @@ KERNEL_FQ void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t AES128_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - const u32 digest_cur = DIGESTS_OFFSET + loop_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + LOOP_POS; u32 data[4]; @@ -285,10 +285,10 @@ KERNEL_FQ void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t AES128_decrypt (ks, data, out, s_td0, s_td1, s_td2, s_td3, s_td4); - out[0] ^= salt_bufs[SALT_POS].salt_buf[0]; - out[1] ^= salt_bufs[SALT_POS].salt_buf[1]; - out[2] ^= salt_bufs[SALT_POS].salt_buf[2]; - out[3] ^= salt_bufs[SALT_POS].salt_buf[3]; + out[0] ^= salt_bufs[SALT_POS_HOST].salt_buf[0]; + out[1] ^= salt_bufs[SALT_POS_HOST].salt_buf[1]; + out[2] ^= salt_bufs[SALT_POS_HOST].salt_buf[2]; + out[3] ^= salt_bufs[SALT_POS_HOST].salt_buf[3]; // do a sha1 of the result @@ -331,10 +331,10 @@ KERNEL_FQ void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t AES128_set_encrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3); - data[0] = digest[0] ^ salt_bufs[SALT_POS].salt_buf[0]; - data[1] = digest[1] ^ salt_bufs[SALT_POS].salt_buf[1]; - data[2] = digest[2] ^ salt_bufs[SALT_POS].salt_buf[2]; - data[3] = digest[3] ^ salt_bufs[SALT_POS].salt_buf[3]; + data[0] = digest[0] ^ salt_bufs[SALT_POS_HOST].salt_buf[0]; + data[1] = digest[1] ^ salt_bufs[SALT_POS_HOST].salt_buf[1]; + data[2] = digest[2] ^ salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[3] = digest[3] ^ salt_bufs[SALT_POS_HOST].salt_buf[3]; AES128_encrypt (ks, data, out, s_te0, s_te1, s_te2, s_te3, s_te4); diff --git a/OpenCL/m09600-pure.cl b/OpenCL/m09600-pure.cl index 3f1acd393..2e060ee13 100644 --- a/OpenCL/m09600-pure.cl +++ b/OpenCL/m09600-pure.cl @@ -39,13 +39,13 @@ KERNEL_FQ void m09600_init (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t ctx; sha512_init (&ctx); - sha512_update_global (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_utf16le_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -65,7 +65,7 @@ KERNEL_FQ void m09600_loop (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x t0 = pack64v (tmps, out, gid, 0); u64x t1 = pack64v (tmps, out, gid, 1); @@ -118,7 +118,7 @@ KERNEL_FQ void m09600_loop (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t w7[2] = 0; w7[3] = (4 + 64) * 8; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { w0[0] = hc_swap32 (j); w0[1] = h32_from_64 (t0); @@ -228,7 +228,7 @@ KERNEL_FQ void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -368,7 +368,7 @@ KERNEL_FQ void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t AES256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - const u32 digest_cur = DIGESTS_OFFSET + loop_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + LOOP_POS; u32 data[4]; @@ -381,10 +381,10 @@ KERNEL_FQ void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t AES256_decrypt (ks, data, out, s_td0, s_td1, s_td2, s_td3, s_td4); - out[0] ^= salt_bufs[SALT_POS].salt_buf[0]; - out[1] ^= salt_bufs[SALT_POS].salt_buf[1]; - out[2] ^= salt_bufs[SALT_POS].salt_buf[2]; - out[3] ^= salt_bufs[SALT_POS].salt_buf[3]; + out[0] ^= salt_bufs[SALT_POS_HOST].salt_buf[0]; + out[1] ^= salt_bufs[SALT_POS_HOST].salt_buf[1]; + out[2] ^= salt_bufs[SALT_POS_HOST].salt_buf[2]; + out[3] ^= salt_bufs[SALT_POS_HOST].salt_buf[3]; // do a sha512 of the result @@ -447,10 +447,10 @@ KERNEL_FQ void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t AES256_set_encrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3); - data[0] = h32_from_64_S (digest[0]) ^ salt_bufs[SALT_POS].salt_buf[0]; - data[1] = l32_from_64_S (digest[0]) ^ salt_bufs[SALT_POS].salt_buf[1]; - data[2] = h32_from_64_S (digest[1]) ^ salt_bufs[SALT_POS].salt_buf[2]; - data[3] = l32_from_64_S (digest[1]) ^ salt_bufs[SALT_POS].salt_buf[3]; + data[0] = h32_from_64_S (digest[0]) ^ salt_bufs[SALT_POS_HOST].salt_buf[0]; + data[1] = l32_from_64_S (digest[0]) ^ salt_bufs[SALT_POS_HOST].salt_buf[1]; + data[2] = h32_from_64_S (digest[1]) ^ salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[3] = l32_from_64_S (digest[1]) ^ salt_bufs[SALT_POS_HOST].salt_buf[3]; AES256_encrypt (ks, data, out, s_te0, s_te1, s_te2, s_te3, s_te4); diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl index 55d8f3f55..94af53443 100644 --- a/OpenCL/m09700_a0-optimized.cl +++ b/OpenCL/m09700_a0-optimized.cl @@ -385,7 +385,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -413,10 +413,10 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt @@ -424,16 +424,16 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -570,7 +570,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -598,10 +598,10 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt @@ -609,10 +609,10 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -620,17 +620,17 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m09700_a1-optimized.cl b/OpenCL/m09700_a1-optimized.cl index 67f93ed7f..12f15b0de 100644 --- a/OpenCL/m09700_a1-optimized.cl +++ b/OpenCL/m09700_a1-optimized.cl @@ -383,7 +383,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -411,10 +411,10 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt @@ -422,16 +422,16 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -469,7 +469,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -626,7 +626,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -654,10 +654,10 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt @@ -665,10 +665,10 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -676,17 +676,17 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -724,7 +724,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl index 2b360e251..7e279556a 100644 --- a/OpenCL/m09700_a3-optimized.cl +++ b/OpenCL/m09700_a3-optimized.cl @@ -37,10 +37,10 @@ DECLSPEC void m09700m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 salt_buf_t0[4]; - salt_buf_t0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf_t0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf_t0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf_t0[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf_t0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf_t0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf_t0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf_t0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 salt_buf_t1[5]; @@ -72,10 +72,10 @@ DECLSPEC void m09700m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop @@ -83,7 +83,7 @@ DECLSPEC void m09700m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -437,10 +437,10 @@ DECLSPEC void m09700s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 salt_buf_t0[4]; - salt_buf_t0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf_t0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf_t0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf_t0[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf_t0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf_t0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf_t0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf_t0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 salt_buf_t1[5]; @@ -472,10 +472,10 @@ DECLSPEC void m09700s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -483,10 +483,10 @@ DECLSPEC void m09700s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -495,7 +495,7 @@ DECLSPEC void m09700s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -842,7 +842,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -880,7 +880,7 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09700m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09700m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -891,7 +891,7 @@ KERNEL_FQ void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -929,7 +929,7 @@ KERNEL_FQ void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09700m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09700m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09700_m16 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -944,7 +944,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -982,7 +982,7 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09700s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09700s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -993,7 +993,7 @@ KERNEL_FQ void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1031,7 +1031,7 @@ KERNEL_FQ void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09700s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09700s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09700_s16 (KERN_ATTR_ESALT (oldoffice01_t)) diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl index 02c357382..906b1705b 100644 --- a/OpenCL/m09710_a0-optimized.cl +++ b/OpenCL/m09710_a0-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,16 +69,16 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -177,7 +177,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -205,10 +205,10 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -216,17 +216,17 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m09710_a1-optimized.cl b/OpenCL/m09710_a1-optimized.cl index eca18ee6c..29be7bf1f 100644 --- a/OpenCL/m09710_a1-optimized.cl +++ b/OpenCL/m09710_a1-optimized.cl @@ -39,7 +39,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -67,16 +67,16 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -221,7 +221,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -249,10 +249,10 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -260,17 +260,17 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -308,7 +308,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl index ef5dfe3f8..ee3a1a894 100644 --- a/OpenCL/m09710_a3-optimized.cl +++ b/OpenCL/m09710_a3-optimized.cl @@ -40,10 +40,10 @@ DECLSPEC void m09710m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop @@ -51,7 +51,7 @@ DECLSPEC void m09710m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -143,10 +143,10 @@ DECLSPEC void m09710s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -154,10 +154,10 @@ DECLSPEC void m09710s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -166,7 +166,7 @@ DECLSPEC void m09710s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -251,7 +251,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -289,7 +289,7 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09710m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09710m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09710_m08 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -308,7 +308,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -346,7 +346,7 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09710s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09710s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09710_s08 (KERN_ATTR_ESALT (oldoffice01_t)) diff --git a/OpenCL/m09720_a0-optimized.cl b/OpenCL/m09720_a0-optimized.cl index 2e457ebe4..30af93809 100644 --- a/OpenCL/m09720_a0-optimized.cl +++ b/OpenCL/m09720_a0-optimized.cl @@ -383,7 +383,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -405,16 +405,16 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -489,7 +489,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -511,10 +511,10 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -522,8 +522,8 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -532,7 +532,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m09720_a1-optimized.cl b/OpenCL/m09720_a1-optimized.cl index e5184f1a5..c6c5cfb2f 100644 --- a/OpenCL/m09720_a1-optimized.cl +++ b/OpenCL/m09720_a1-optimized.cl @@ -381,7 +381,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -403,16 +403,16 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -450,7 +450,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -537,7 +537,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -559,10 +559,10 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -570,8 +570,8 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -580,7 +580,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -618,7 +618,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m09720_a3-optimized.cl b/OpenCL/m09720_a3-optimized.cl index 50cb08962..6d9a208b8 100644 --- a/OpenCL/m09720_a3-optimized.cl +++ b/OpenCL/m09720_a3-optimized.cl @@ -382,10 +382,10 @@ DECLSPEC void m09720m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop @@ -393,7 +393,7 @@ DECLSPEC void m09720m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -472,10 +472,10 @@ DECLSPEC void m09720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -483,8 +483,8 @@ DECLSPEC void m09720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -495,7 +495,7 @@ DECLSPEC void m09720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -567,7 +567,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -603,7 +603,7 @@ KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - m09720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -614,7 +614,7 @@ KERNEL_FQ void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -650,7 +650,7 @@ KERNEL_FQ void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - m09720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -665,7 +665,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -701,7 +701,7 @@ KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - m09720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) @@ -712,7 +712,7 @@ KERNEL_FQ void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -748,7 +748,7 @@ KERNEL_FQ void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - m09720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09720_s16 (KERN_ATTR_ESALT (oldoffice01_t)) diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl index e9987ee54..433c00be6 100644 --- a/OpenCL/m09800_a0-optimized.cl +++ b/OpenCL/m09800_a0-optimized.cl @@ -45,7 +45,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -73,29 +73,29 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt */ - const u32 version = esalt_bufs[DIGESTS_OFFSET].version; + const u32 version = esalt_bufs[DIGESTS_OFFSET_HOST].version; u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -221,11 +221,11 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) // initial compare - int digest_pos = find_hash (out, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (out, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos == -1) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -265,10 +265,10 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; j = rc4_next_16 (S, 0, 0, secondBlockData, out); @@ -282,10 +282,10 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -300,11 +300,11 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } @@ -331,7 +331,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -359,23 +359,23 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt */ - const u32 version = esalt_bufs[DIGESTS_OFFSET].version; + const u32 version = esalt_bufs[DIGESTS_OFFSET_HOST].version; u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -383,17 +383,17 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -524,7 +524,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if (out[2] != search[2]) continue; if (out[3] != search[3]) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -564,10 +564,10 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; j = rc4_next_16 (S, 0, 0, secondBlockData, out); @@ -581,10 +581,10 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -599,9 +599,9 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m09800_a1-optimized.cl b/OpenCL/m09800_a1-optimized.cl index 59d236b07..feb749ce9 100644 --- a/OpenCL/m09800_a1-optimized.cl +++ b/OpenCL/m09800_a1-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -71,29 +71,29 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt */ - const u32 version = esalt_bufs[DIGESTS_OFFSET].version; + const u32 version = esalt_bufs[DIGESTS_OFFSET_HOST].version; u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -131,7 +131,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -269,11 +269,11 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) // initial compare - int digest_pos = find_hash (out, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (out, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos == -1) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -313,10 +313,10 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; j = rc4_next_16 (S, 0, 0, secondBlockData, out); @@ -330,10 +330,10 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -348,11 +348,11 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } @@ -379,7 +379,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -407,23 +407,23 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt */ - const u32 version = esalt_bufs[DIGESTS_OFFSET].version; + const u32 version = esalt_bufs[DIGESTS_OFFSET_HOST].version; u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -431,17 +431,17 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -479,7 +479,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -622,7 +622,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) if (out[2] != search[2]) continue; if (out[3] != search[3]) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -662,10 +662,10 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; j = rc4_next_16 (S, 0, 0, secondBlockData, out); @@ -679,10 +679,10 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -697,9 +697,9 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m09800_a3-optimized.cl b/OpenCL/m09800_a3-optimized.cl index 9ce63b258..38ee92f36 100644 --- a/OpenCL/m09800_a3-optimized.cl +++ b/OpenCL/m09800_a3-optimized.cl @@ -41,23 +41,23 @@ DECLSPEC void m09800m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt */ - const u32 version = esalt_bufs[DIGESTS_OFFSET].version; + const u32 version = esalt_bufs[DIGESTS_OFFSET_HOST].version; u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop @@ -65,7 +65,7 @@ DECLSPEC void m09800m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -188,11 +188,11 @@ DECLSPEC void m09800m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons // initial compare - int digest_pos = find_hash (out, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (out, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos == -1) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -232,10 +232,10 @@ DECLSPEC void m09800m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; j = rc4_next_16 (S, 0, 0, secondBlockData, out); @@ -249,10 +249,10 @@ DECLSPEC void m09800m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -267,11 +267,11 @@ DECLSPEC void m09800m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if (null_bytes < MIN_NULL_BYTES) continue; } - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } @@ -291,23 +291,23 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * esalt */ - const u32 version = esalt_bufs[DIGESTS_OFFSET].version; + const u32 version = esalt_bufs[DIGESTS_OFFSET_HOST].version; u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -315,10 +315,10 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -327,7 +327,7 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -455,7 +455,7 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if (out[2] != search[2]) continue; if (out[3] != search[3]) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -495,10 +495,10 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; j = rc4_next_16 (S, 0, 0, secondBlockData, out); @@ -512,10 +512,10 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -530,9 +530,9 @@ DECLSPEC void m09800s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if (null_bytes < MIN_NULL_BYTES) continue; } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -545,7 +545,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -583,7 +583,7 @@ KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09800m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09800m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -594,7 +594,7 @@ KERNEL_FQ void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -632,7 +632,7 @@ KERNEL_FQ void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09800m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09800m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -643,7 +643,7 @@ KERNEL_FQ void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -681,7 +681,7 @@ KERNEL_FQ void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09800m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09800m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -692,7 +692,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -730,7 +730,7 @@ KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09800s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09800s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -741,7 +741,7 @@ KERNEL_FQ void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -779,7 +779,7 @@ KERNEL_FQ void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09800s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09800s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -790,7 +790,7 @@ KERNEL_FQ void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -828,5 +828,5 @@ KERNEL_FQ void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09800s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09800s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl index b7d8eacec..aa600cbba 100644 --- a/OpenCL/m09810_a0-optimized.cl +++ b/OpenCL/m09810_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -71,16 +71,16 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -166,7 +166,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -194,10 +194,10 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -205,17 +205,17 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m09810_a1-optimized.cl b/OpenCL/m09810_a1-optimized.cl index 7bdaf201e..0574ff551 100644 --- a/OpenCL/m09810_a1-optimized.cl +++ b/OpenCL/m09810_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,16 +69,16 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -116,7 +116,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -210,7 +210,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -238,10 +238,10 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -249,17 +249,17 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -297,7 +297,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl index 775d03158..219c6dc50 100644 --- a/OpenCL/m09810_a3-optimized.cl +++ b/OpenCL/m09810_a3-optimized.cl @@ -42,10 +42,10 @@ DECLSPEC void m09810m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * loop @@ -53,7 +53,7 @@ DECLSPEC void m09810m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -130,10 +130,10 @@ DECLSPEC void m09810s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 encryptedVerifier[4]; - encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[0]; - encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[1]; - encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[2]; - encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET].encryptedVerifier[3]; + encryptedVerifier[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[0]; + encryptedVerifier[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[1]; + encryptedVerifier[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[2]; + encryptedVerifier[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encryptedVerifier[3]; /** * digest @@ -141,10 +141,10 @@ DECLSPEC void m09810s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -153,7 +153,7 @@ DECLSPEC void m09810s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -223,7 +223,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -261,7 +261,7 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09810m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09810m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -272,7 +272,7 @@ KERNEL_FQ void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -310,7 +310,7 @@ KERNEL_FQ void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09810m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09810m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -321,7 +321,7 @@ KERNEL_FQ void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -359,7 +359,7 @@ KERNEL_FQ void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09810m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09810m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -370,7 +370,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -408,7 +408,7 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09810s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09810s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -419,7 +419,7 @@ KERNEL_FQ void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -457,7 +457,7 @@ KERNEL_FQ void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09810s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09810s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -468,7 +468,7 @@ KERNEL_FQ void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -506,5 +506,5 @@ KERNEL_FQ void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09810s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09810s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m09820_a0-optimized.cl b/OpenCL/m09820_a0-optimized.cl index 7c89d2c8c..fdf23c445 100644 --- a/OpenCL/m09820_a0-optimized.cl +++ b/OpenCL/m09820_a0-optimized.cl @@ -45,7 +45,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -73,16 +73,16 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -163,11 +163,11 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) // initial compare - int digest_pos = find_hash (digest, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos == -1) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -207,10 +207,10 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; u32 out[4]; @@ -226,10 +226,10 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -244,11 +244,11 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } @@ -275,7 +275,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -303,10 +303,10 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -314,8 +314,8 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -324,7 +324,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -408,7 +408,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if (digest[0] != search[0]) continue; if (digest[1] != search[1]) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -448,10 +448,10 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; u32 out[4]; @@ -467,10 +467,10 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -485,9 +485,9 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m09820_a1-optimized.cl b/OpenCL/m09820_a1-optimized.cl index 187bf54a2..3c4ffefd7 100644 --- a/OpenCL/m09820_a1-optimized.cl +++ b/OpenCL/m09820_a1-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -71,16 +71,16 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -118,7 +118,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -211,11 +211,11 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) // initial compare - int digest_pos = find_hash (digest, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos == -1) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -255,10 +255,10 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; u32 out[4]; @@ -274,10 +274,10 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -292,11 +292,11 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } @@ -323,7 +323,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -351,10 +351,10 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -362,8 +362,8 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -372,7 +372,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -410,7 +410,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -506,7 +506,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) if (digest[0] != search[0]) continue; if (digest[1] != search[1]) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -546,10 +546,10 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; u32 out[4]; @@ -565,10 +565,10 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -583,9 +583,9 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) if (null_bytes < MIN_NULL_BYTES) continue; } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m09820_a3-optimized.cl b/OpenCL/m09820_a3-optimized.cl index 1dccc017e..e0cbd2e8d 100644 --- a/OpenCL/m09820_a3-optimized.cl +++ b/OpenCL/m09820_a3-optimized.cl @@ -44,10 +44,10 @@ DECLSPEC void m09820m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop @@ -55,7 +55,7 @@ DECLSPEC void m09820m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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); @@ -131,11 +131,11 @@ DECLSPEC void m09820m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons // initial compare - int digest_pos = find_hash (digest, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos == -1) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -175,10 +175,10 @@ DECLSPEC void m09820m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; u32 out[4]; @@ -194,10 +194,10 @@ DECLSPEC void m09820m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -212,11 +212,11 @@ DECLSPEC void m09820m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if (null_bytes < MIN_NULL_BYTES) continue; } - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } @@ -236,10 +236,10 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -247,8 +247,8 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -259,7 +259,7 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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); @@ -338,7 +338,7 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if (digest[0] != search[0]) continue; if (digest[1] != search[1]) continue; - if (esalt_bufs[DIGESTS_OFFSET].secondBlockLen != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockLen != 0) { w0[0] = pass_hash[0]; w0[1] = pass_hash[1]; @@ -378,10 +378,10 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 secondBlockData[4]; - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[0]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[1]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[2]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[3]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[0]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[1]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[2]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[3]; u32 out[4]; @@ -397,10 +397,10 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if ((out[k] & 0xff000000) == 0) null_bytes++; } - secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[4]; - secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[5]; - secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[6]; - secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET].secondBlockData[7]; + secondBlockData[0] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[4]; + secondBlockData[1] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[5]; + secondBlockData[2] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[6]; + secondBlockData[3] = esalt_bufs[DIGESTS_OFFSET_HOST].secondBlockData[7]; rc4_next_16 (S, 16, j, secondBlockData, out); @@ -415,9 +415,9 @@ DECLSPEC void m09820s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons if (null_bytes < MIN_NULL_BYTES) continue; } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -430,7 +430,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -468,7 +468,7 @@ KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09820m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09820m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -479,7 +479,7 @@ KERNEL_FQ void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -517,7 +517,7 @@ KERNEL_FQ void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09820m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09820m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -528,7 +528,7 @@ KERNEL_FQ void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -566,7 +566,7 @@ KERNEL_FQ void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09820m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09820m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -577,7 +577,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -615,7 +615,7 @@ KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09820s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09820s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -626,7 +626,7 @@ KERNEL_FQ void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -664,7 +664,7 @@ KERNEL_FQ void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09820s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09820s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) @@ -675,7 +675,7 @@ KERNEL_FQ void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -713,5 +713,5 @@ KERNEL_FQ void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m09820s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09820s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m09900_a0-optimized.cl b/OpenCL/m09900_a0-optimized.cl index 8072178fe..038386c3e 100644 --- a/OpenCL/m09900_a0-optimized.cl +++ b/OpenCL/m09900_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -264,7 +264,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -286,17 +286,17 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m09900_a0-pure.cl b/OpenCL/m09900_a0-pure.cl index 1d15473f5..ff9f8b5ab 100644 --- a/OpenCL/m09900_a0-pure.cl +++ b/OpenCL/m09900_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m09900_a1-optimized.cl b/OpenCL/m09900_a1-optimized.cl index 78edebb4d..e73623114 100644 --- a/OpenCL/m09900_a1-optimized.cl +++ b/OpenCL/m09900_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -322,7 +322,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -344,17 +344,17 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -392,7 +392,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m09900_a1-pure.cl b/OpenCL/m09900_a1-pure.cl index febd833c3..2f318d0de 100644 --- a/OpenCL/m09900_a1-pure.cl +++ b/OpenCL/m09900_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m09900_a3-optimized.cl b/OpenCL/m09900_a3-optimized.cl index a620418c9..ee590609e 100644 --- a/OpenCL/m09900_a3-optimized.cl +++ b/OpenCL/m09900_a3-optimized.cl @@ -127,7 +127,7 @@ DECLSPEC void m09900m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -408,10 +408,10 @@ DECLSPEC void m09900s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -420,7 +420,7 @@ DECLSPEC void m09900s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -599,7 +599,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -626,7 +626,7 @@ KERNEL_FQ void m09900_m04 (KERN_ATTR_VECTOR ()) * main */ - m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09900_m08 (KERN_ATTR_VECTOR ()) @@ -637,7 +637,7 @@ KERNEL_FQ void m09900_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -664,7 +664,7 @@ KERNEL_FQ void m09900_m08 (KERN_ATTR_VECTOR ()) * main */ - m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09900_m16 (KERN_ATTR_VECTOR ()) @@ -675,7 +675,7 @@ KERNEL_FQ void m09900_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -702,7 +702,7 @@ KERNEL_FQ void m09900_m16 (KERN_ATTR_VECTOR ()) * main */ - m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09900_s04 (KERN_ATTR_VECTOR ()) @@ -713,7 +713,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -740,7 +740,7 @@ KERNEL_FQ void m09900_s04 (KERN_ATTR_VECTOR ()) * main */ - m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09900_s08 (KERN_ATTR_VECTOR ()) @@ -751,7 +751,7 @@ KERNEL_FQ void m09900_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -778,7 +778,7 @@ KERNEL_FQ void m09900_s08 (KERN_ATTR_VECTOR ()) * main */ - m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m09900_s16 (KERN_ATTR_VECTOR ()) @@ -789,7 +789,7 @@ KERNEL_FQ void m09900_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -816,5 +816,5 @@ KERNEL_FQ void m09900_s16 (KERN_ATTR_VECTOR ()) * main */ - m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m09900_a3-pure.cl b/OpenCL/m09900_a3-pure.cl index 04d91452f..a535c248d 100644 --- a/OpenCL/m09900_a3-pure.cl +++ b/OpenCL/m09900_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m09900_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m09900_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10100_a0-optimized.cl b/OpenCL/m10100_a0-optimized.cl index 8ca806e8f..8e5c31e0e 100644 --- a/OpenCL/m10100_a0-optimized.cl +++ b/OpenCL/m10100_a0-optimized.cl @@ -46,7 +46,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -71,16 +71,16 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_RULES ()) u64x v2p = SIPHASHM_2; u64x v3p = SIPHASHM_3; - v0p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v1p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); - v2p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v3p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); + v0p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v1p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); + v2p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v3p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -173,7 +173,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -198,10 +198,10 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_RULES ()) u64x v2p = SIPHASHM_2; u64x v3p = SIPHASHM_3; - v0p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v1p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); - v2p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v3p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); + v0p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v1p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); + v2p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v3p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); /** * digest @@ -209,8 +209,8 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -219,7 +219,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10100_a1-optimized.cl b/OpenCL/m10100_a1-optimized.cl index 867272b53..60e2dc73b 100644 --- a/OpenCL/m10100_a1-optimized.cl +++ b/OpenCL/m10100_a1-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,16 +69,16 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_BASIC ()) u64x v2p = SIPHASHM_2; u64x v3p = SIPHASHM_3; - v0p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v1p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); - v2p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v3p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); + v0p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v1p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); + v2p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v3p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -116,7 +116,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -231,7 +231,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -256,10 +256,10 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ()) u64x v2p = SIPHASHM_2; u64x v3p = SIPHASHM_3; - v0p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v1p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); - v2p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v3p ^= hl32_to_64 (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); + v0p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v1p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); + v2p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v3p ^= hl32_to_64 (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); /** * digest @@ -267,8 +267,8 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -277,7 +277,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -315,7 +315,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10100_a3-optimized.cl b/OpenCL/m10100_a3-optimized.cl index 08702bf00..d1d0c92d0 100644 --- a/OpenCL/m10100_a3-optimized.cl +++ b/OpenCL/m10100_a3-optimized.cl @@ -47,10 +47,10 @@ DECLSPEC void m10100m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u64 v2p = SIPHASHM_2; u64 v3p = SIPHASHM_3; - v0p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v1p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); - v2p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v3p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); + v0p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v1p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); + v2p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v3p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); switch (pw_len / 8) { @@ -66,7 +66,7 @@ DECLSPEC void m10100m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -141,10 +141,10 @@ DECLSPEC void m10100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u64 v2p = SIPHASHM_2; u64 v3p = SIPHASHM_3; - v0p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v1p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); - v2p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[1], salt_bufs[SALT_POS].salt_buf[0]); - v3p ^= hl32_to_64_S (salt_bufs[SALT_POS].salt_buf[3], salt_bufs[SALT_POS].salt_buf[2]); + v0p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v1p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); + v2p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[1], salt_bufs[SALT_POS_HOST].salt_buf[0]); + v3p ^= hl32_to_64_S (salt_bufs[SALT_POS_HOST].salt_buf[3], salt_bufs[SALT_POS_HOST].salt_buf[2]); switch (pw_len / 8) { @@ -160,8 +160,8 @@ DECLSPEC void m10100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -172,7 +172,7 @@ DECLSPEC void m10100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -237,7 +237,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -264,7 +264,7 @@ KERNEL_FQ void m10100_m04 (KERN_ATTR_VECTOR ()) * main */ - m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10100_m08 (KERN_ATTR_VECTOR ()) @@ -275,7 +275,7 @@ KERNEL_FQ void m10100_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -302,7 +302,7 @@ KERNEL_FQ void m10100_m08 (KERN_ATTR_VECTOR ()) * main */ - m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10100_m16 (KERN_ATTR_VECTOR ()) @@ -313,7 +313,7 @@ KERNEL_FQ void m10100_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -340,7 +340,7 @@ KERNEL_FQ void m10100_m16 (KERN_ATTR_VECTOR ()) * main */ - m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10100_s04 (KERN_ATTR_VECTOR ()) @@ -351,7 +351,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -378,7 +378,7 @@ KERNEL_FQ void m10100_s04 (KERN_ATTR_VECTOR ()) * main */ - m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10100_s08 (KERN_ATTR_VECTOR ()) @@ -389,7 +389,7 @@ KERNEL_FQ void m10100_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -416,7 +416,7 @@ KERNEL_FQ void m10100_s08 (KERN_ATTR_VECTOR ()) * main */ - m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10100_s16 (KERN_ATTR_VECTOR ()) @@ -427,7 +427,7 @@ KERNEL_FQ void m10100_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -454,5 +454,5 @@ KERNEL_FQ void m10100_s16 (KERN_ATTR_VECTOR ()) * main */ - m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10300-pure.cl b/OpenCL/m10300-pure.cl index 58bae327f..33655b875 100644 --- a/OpenCL/m10300-pure.cl +++ b/OpenCL/m10300-pure.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m10300_init (KERN_ATTR_TMPS (saph_sha1_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t ctx; @@ -36,7 +36,7 @@ KERNEL_FQ void m10300_init (KERN_ATTR_TMPS (saph_sha1_tmp_t)) sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); - sha1_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_final (&ctx); @@ -55,7 +55,7 @@ KERNEL_FQ void m10300_loop (KERN_ATTR_TMPS (saph_sha1_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -83,7 +83,7 @@ KERNEL_FQ void m10300_loop (KERN_ATTR_TMPS (saph_sha1_tmp_t)) * loop */ - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { u32 w0[4]; u32 w1[4]; @@ -135,7 +135,7 @@ KERNEL_FQ void m10300_comp (KERN_ATTR_TMPS (saph_sha1_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl index 368ce44c6..f36a9b400 100644 --- a/OpenCL/m10400_a0-optimized.cl +++ b/OpenCL/m10400_a0-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_RULES_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -97,29 +97,29 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_RULES_ u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -243,7 +243,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_RULES_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -287,23 +287,23 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_RULES_ u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * digest @@ -311,17 +311,17 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_RULES_ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10400_a1-optimized.cl b/OpenCL/m10400_a1-optimized.cl index df63ad87f..5982efb32 100644 --- a/OpenCL/m10400_a1-optimized.cl +++ b/OpenCL/m10400_a1-optimized.cl @@ -51,7 +51,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -95,29 +95,29 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -155,7 +155,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -301,7 +301,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -345,23 +345,23 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * digest @@ -369,17 +369,17 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -417,7 +417,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl index 150466322..8a13c1b73 100644 --- a/OpenCL/m10400_a3-optimized.cl +++ b/OpenCL/m10400_a3-optimized.cl @@ -68,23 +68,23 @@ DECLSPEC void m10400m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; u32 p0[4]; u32 p1[4]; @@ -133,7 +133,7 @@ DECLSPEC void m10400m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -244,23 +244,23 @@ DECLSPEC void m10400s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; u32 p0[4]; u32 p1[4]; @@ -309,10 +309,10 @@ DECLSPEC void m10400s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -321,7 +321,7 @@ DECLSPEC void m10400s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -409,7 +409,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -447,7 +447,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m04 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_ESALT (pdf_t)) @@ -458,7 +458,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -496,7 +496,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m08 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_ESALT (pdf_t)) @@ -507,7 +507,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -545,7 +545,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_m16 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10400m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT (pdf_t)) @@ -556,7 +556,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -594,7 +594,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s04 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_ESALT (pdf_t)) @@ -605,7 +605,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10400_s08 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) @@ -654,7 +654,7 @@ KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -692,5 +692,5 @@ KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10400s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl index 026cf0131..63c247133 100644 --- a/OpenCL/m10410_a0-optimized.cl +++ b/OpenCL/m10410_a0-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_RULES_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -95,7 +95,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_RULES_ * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -140,7 +140,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_RULES_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -184,17 +184,17 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_RULES_ const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10410_a1-optimized.cl b/OpenCL/m10410_a1-optimized.cl index 831007d0b..005c490b8 100644 --- a/OpenCL/m10410_a1-optimized.cl +++ b/OpenCL/m10410_a1-optimized.cl @@ -51,7 +51,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -95,29 +95,29 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -155,7 +155,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -207,7 +207,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -251,23 +251,23 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * digest @@ -275,17 +275,17 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -323,7 +323,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl index 98cc5478f..978918a34 100644 --- a/OpenCL/m10410_a3-optimized.cl +++ b/OpenCL/m10410_a3-optimized.cl @@ -68,7 +68,7 @@ DECLSPEC void m10410m (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -121,10 +121,10 @@ DECLSPEC void m10410s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -133,7 +133,7 @@ DECLSPEC void m10410s (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, cons u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -163,7 +163,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -201,7 +201,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m04 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10410m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10410m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m08 (KERN_ATTR_ESALT (pdf_t)) @@ -212,7 +212,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m08 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -250,7 +250,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m08 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10410m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10410m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m16 (KERN_ATTR_ESALT (pdf_t)) @@ -261,7 +261,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m16 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -299,7 +299,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_m16 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10410m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10410m (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT (pdf_t)) @@ -310,7 +310,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -348,7 +348,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s04 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10410s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10410s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s08 (KERN_ATTR_ESALT (pdf_t)) @@ -359,7 +359,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s08 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -397,7 +397,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s08 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10410s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10410s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s16 (KERN_ATTR_ESALT (pdf_t)) @@ -408,7 +408,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s16 (KERN_ATTR_ESALT const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -446,5 +446,5 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m10410_s16 (KERN_ATTR_ESALT LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m10410s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10410s (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl index ea4ba1794..aabd85015 100644 --- a/OpenCL/m10420_a0-optimized.cl +++ b/OpenCL/m10420_a0-optimized.cl @@ -63,7 +63,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -85,29 +85,29 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -224,7 +224,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -246,23 +246,23 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * digest @@ -270,8 +270,8 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -280,7 +280,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10420_a1-optimized.cl b/OpenCL/m10420_a1-optimized.cl index 2f41cefa1..3c8c0f7ca 100644 --- a/OpenCL/m10420_a1-optimized.cl +++ b/OpenCL/m10420_a1-optimized.cl @@ -61,7 +61,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -83,29 +83,29 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -282,7 +282,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -304,23 +304,23 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; /** * digest @@ -328,8 +328,8 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -338,7 +338,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -376,7 +376,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10420_a3-optimized.cl b/OpenCL/m10420_a3-optimized.cl index c30cf75cf..8ea9798af 100644 --- a/OpenCL/m10420_a3-optimized.cl +++ b/OpenCL/m10420_a3-optimized.cl @@ -62,23 +62,23 @@ DECLSPEC void m10420m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; u32 p0[4]; u32 p1[4]; @@ -127,7 +127,7 @@ DECLSPEC void m10420m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 w0r = (u32) bfs_buf[il_pos + 0].i; @@ -215,23 +215,23 @@ DECLSPEC void m10420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[4]; - id_buf[0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; u32 p0[4]; u32 p1[4]; @@ -280,8 +280,8 @@ DECLSPEC void m10420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -292,7 +292,7 @@ DECLSPEC void m10420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 w0r = (u32) bfs_buf[il_pos].i; @@ -373,7 +373,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -409,7 +409,7 @@ KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) * main */ - m10420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) @@ -420,7 +420,7 @@ KERNEL_FQ void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -456,7 +456,7 @@ KERNEL_FQ void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) * main */ - m10420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) @@ -467,7 +467,7 @@ KERNEL_FQ void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -503,7 +503,7 @@ KERNEL_FQ void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) * main */ - m10420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10420m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) @@ -514,7 +514,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -550,7 +550,7 @@ KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) * main */ - m10420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) @@ -561,7 +561,7 @@ KERNEL_FQ void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -597,7 +597,7 @@ KERNEL_FQ void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) * main */ - m10420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) @@ -608,7 +608,7 @@ KERNEL_FQ void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -644,5 +644,5 @@ KERNEL_FQ void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) * main */ - m10420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10420s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl index 4bf9a13e3..b3cf7bd7a 100644 --- a/OpenCL/m10500-pure.cl +++ b/OpenCL/m10500-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) const u64 gid = get_global_id (0); //const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -76,48 +76,48 @@ KERNEL_FQ void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) u32 o_buf[8]; - o_buf[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; - o_buf[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - o_buf[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - o_buf[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; - o_buf[4] = esalt_bufs[DIGESTS_OFFSET].o_buf[4]; - o_buf[5] = esalt_bufs[DIGESTS_OFFSET].o_buf[5]; - o_buf[6] = esalt_bufs[DIGESTS_OFFSET].o_buf[6]; - o_buf[7] = esalt_bufs[DIGESTS_OFFSET].o_buf[7]; + o_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; + o_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + o_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + o_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; + o_buf[4] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[4]; + o_buf[5] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[5]; + o_buf[6] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[6]; + o_buf[7] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[7]; - u32 P = esalt_bufs[DIGESTS_OFFSET].P; + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; u32 id_buf[12]; - id_buf[ 0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[ 1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[ 2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[ 3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; - id_buf[ 4] = esalt_bufs[DIGESTS_OFFSET].id_buf[4]; - id_buf[ 5] = esalt_bufs[DIGESTS_OFFSET].id_buf[5]; - id_buf[ 6] = esalt_bufs[DIGESTS_OFFSET].id_buf[6]; - id_buf[ 7] = esalt_bufs[DIGESTS_OFFSET].id_buf[7]; + id_buf[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[4]; + id_buf[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[5]; + id_buf[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[6]; + id_buf[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[7]; id_buf[ 8] = 0; id_buf[ 9] = 0; id_buf[10] = 0; id_buf[11] = 0; - u32 id_len = esalt_bufs[DIGESTS_OFFSET].id_len; + u32 id_len = esalt_bufs[DIGESTS_OFFSET_HOST].id_len; u32 id_len4 = id_len / 4; u32 rc4data[2]; - rc4data[0] = esalt_bufs[DIGESTS_OFFSET].rc4data[0]; - rc4data[1] = esalt_bufs[DIGESTS_OFFSET].rc4data[1]; + rc4data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].rc4data[0]; + rc4data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].rc4data[1]; u32 final_length = 68 + id_len; u32 w11 = 0x80; u32 w12 = 0; - if (esalt_bufs[DIGESTS_OFFSET].enc_md != 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].enc_md != 1) { w11 = 0xffffffff; w12 = 0x80; @@ -239,7 +239,7 @@ KERNEL_FQ void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * shared @@ -265,7 +265,7 @@ KERNEL_FQ void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) out[2] = tmps[gid].out[2]; out[3] = tmps[gid].out[3]; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { if (j < 50) { @@ -339,7 +339,7 @@ KERNEL_FQ void m10500_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl index ef6ec2718..c8f873b8f 100644 --- a/OpenCL/m10700-optimized.cl +++ b/OpenCL/m10700-optimized.cl @@ -577,7 +577,7 @@ KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t ctx; @@ -585,7 +585,7 @@ KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) sha256_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); - sha256_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_final (&ctx); @@ -640,7 +640,7 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -678,12 +678,12 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) u32 ex = 0; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { ex = do_round (s_sc[lid], w0, pw_len, &ctx, s_te0, s_te1, s_te2, s_te3, s_te4); } - if ((loop_pos + loop_cnt) == 64) + if ((LOOP_POS + LOOP_CNT) == 64) { for (u32 i = 64; i < (ex & 0xff) + 32; i++) { @@ -711,7 +711,7 @@ KERNEL_FQ void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m10700-pure.cl b/OpenCL/m10700-pure.cl index 94254a0d9..e920d5f7d 100644 --- a/OpenCL/m10700-pure.cl +++ b/OpenCL/m10700-pure.cl @@ -1173,7 +1173,7 @@ KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t ctx; @@ -1181,7 +1181,7 @@ KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) sha256_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); - sha256_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_final (&ctx); @@ -1248,7 +1248,7 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1273,12 +1273,12 @@ KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) u32 ex = 0; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { ex = do_round (w, pw_len, &tmp, s_te0, s_te1, s_te2, s_te3, s_te4); } - if ((loop_pos + loop_cnt) == 64) + if ((LOOP_POS + LOOP_CNT) == 64) { for (u32 i = 64; i < (ex & 0xff) + 32; i++) { @@ -1297,7 +1297,7 @@ KERNEL_FQ void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl index 26d5ac84f..d0f667acc 100644 --- a/OpenCL/m10800_a0-optimized.cl +++ b/OpenCL/m10800_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,7 +156,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -237,7 +237,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -259,17 +259,17 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10800_a0-pure.cl b/OpenCL/m10800_a0-pure.cl index 429ab7d0c..963190d4e 100644 --- a/OpenCL/m10800_a0-pure.cl +++ b/OpenCL/m10800_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m10800_a1-optimized.cl b/OpenCL/m10800_a1-optimized.cl index f09627684..3f25247ef 100644 --- a/OpenCL/m10800_a1-optimized.cl +++ b/OpenCL/m10800_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,7 +154,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -192,7 +192,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -293,7 +293,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -315,17 +315,17 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -363,7 +363,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10800_a1-pure.cl b/OpenCL/m10800_a1-pure.cl index c49711d20..016556d81 100644 --- a/OpenCL/m10800_a1-pure.cl +++ b/OpenCL/m10800_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; diff --git a/OpenCL/m10800_a3-optimized.cl b/OpenCL/m10800_a3-optimized.cl index eb3a08a41..8f0d9af4f 100644 --- a/OpenCL/m10800_a3-optimized.cl +++ b/OpenCL/m10800_a3-optimized.cl @@ -135,7 +135,7 @@ DECLSPEC void m10800m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -200,10 +200,10 @@ DECLSPEC void m10800s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -212,7 +212,7 @@ DECLSPEC void m10800s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -270,7 +270,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -297,7 +297,7 @@ KERNEL_FQ void m10800_m04 (KERN_ATTR_VECTOR ()) * main */ - m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10800_m08 (KERN_ATTR_VECTOR ()) @@ -308,7 +308,7 @@ KERNEL_FQ void m10800_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -335,7 +335,7 @@ KERNEL_FQ void m10800_m08 (KERN_ATTR_VECTOR ()) * main */ - m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10800_m16 (KERN_ATTR_VECTOR ()) @@ -346,7 +346,7 @@ KERNEL_FQ void m10800_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -373,7 +373,7 @@ KERNEL_FQ void m10800_m16 (KERN_ATTR_VECTOR ()) * main */ - m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10800_s04 (KERN_ATTR_VECTOR ()) @@ -384,7 +384,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -411,7 +411,7 @@ KERNEL_FQ void m10800_s04 (KERN_ATTR_VECTOR ()) * main */ - m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10800_s08 (KERN_ATTR_VECTOR ()) @@ -422,7 +422,7 @@ KERNEL_FQ void m10800_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -449,7 +449,7 @@ KERNEL_FQ void m10800_s08 (KERN_ATTR_VECTOR ()) * main */ - m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10800_s16 (KERN_ATTR_VECTOR ()) @@ -460,7 +460,7 @@ KERNEL_FQ void m10800_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -487,5 +487,5 @@ KERNEL_FQ void m10800_s16 (KERN_ATTR_VECTOR ()) * main */ - m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10800_a3-pure.cl b/OpenCL/m10800_a3-pure.cl index 0ebe66dc1..b67ef2916 100644 --- a/OpenCL/m10800_a3-pure.cl +++ b/OpenCL/m10800_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m10800_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m10800_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10810_a0-optimized.cl b/OpenCL/m10810_a0-optimized.cl index e5acbd5a4..d4f159fcd 100644 --- a/OpenCL/m10810_a0-optimized.cl +++ b/OpenCL/m10810_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -310,7 +310,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -335,24 +335,24 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -360,17 +360,17 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10810_a0-pure.cl b/OpenCL/m10810_a0-pure.cl index 70678f4fd..07a8aaa87 100644 --- a/OpenCL/m10810_a0-pure.cl +++ b/OpenCL/m10810_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m10810_a1-optimized.cl b/OpenCL/m10810_a1-optimized.cl index 02a0dc838..2c95ed439 100644 --- a/OpenCL/m10810_a1-optimized.cl +++ b/OpenCL/m10810_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -368,7 +368,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -393,24 +393,24 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -418,17 +418,17 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -466,7 +466,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10810_a1-pure.cl b/OpenCL/m10810_a1-pure.cl index d9ab6f013..b9cba988b 100644 --- a/OpenCL/m10810_a1-pure.cl +++ b/OpenCL/m10810_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha384_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha384_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; diff --git a/OpenCL/m10810_a3-optimized.cl b/OpenCL/m10810_a3-optimized.cl index d00582895..2a351a4bc 100644 --- a/OpenCL/m10810_a3-optimized.cl +++ b/OpenCL/m10810_a3-optimized.cl @@ -138,22 +138,22 @@ DECLSPEC void m10810m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -174,7 +174,7 @@ DECLSPEC void m10810m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -186,7 +186,7 @@ DECLSPEC void m10810m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -251,10 +251,10 @@ DECLSPEC void m10810s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -263,7 +263,7 @@ DECLSPEC void m10810s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -321,7 +321,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -348,7 +348,7 @@ KERNEL_FQ void m10810_m04 (KERN_ATTR_VECTOR ()) * main */ - m10810m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10810m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10810_m08 (KERN_ATTR_VECTOR ()) @@ -359,7 +359,7 @@ KERNEL_FQ void m10810_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -386,7 +386,7 @@ KERNEL_FQ void m10810_m08 (KERN_ATTR_VECTOR ()) * main */ - m10810m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10810m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10810_m16 (KERN_ATTR_VECTOR ()) @@ -397,7 +397,7 @@ KERNEL_FQ void m10810_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -424,7 +424,7 @@ KERNEL_FQ void m10810_m16 (KERN_ATTR_VECTOR ()) * main */ - m10810m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10810m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10810_s04 (KERN_ATTR_VECTOR ()) @@ -435,7 +435,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -462,7 +462,7 @@ KERNEL_FQ void m10810_s04 (KERN_ATTR_VECTOR ()) * main */ - m10810s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10810s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10810_s08 (KERN_ATTR_VECTOR ()) @@ -473,7 +473,7 @@ KERNEL_FQ void m10810_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -500,7 +500,7 @@ KERNEL_FQ void m10810_s08 (KERN_ATTR_VECTOR ()) * main */ - m10810s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10810s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10810_s16 (KERN_ATTR_VECTOR ()) @@ -511,7 +511,7 @@ KERNEL_FQ void m10810_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -538,5 +538,5 @@ KERNEL_FQ void m10810_s16 (KERN_ATTR_VECTOR ()) * main */ - m10810s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10810s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10810_a3-pure.cl b/OpenCL/m10810_a3-pure.cl index 2987d6e9e..e3d7587e6 100644 --- a/OpenCL/m10810_a3-pure.cl +++ b/OpenCL/m10810_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m10810_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m10810_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10820_a0-optimized.cl b/OpenCL/m10820_a0-optimized.cl index 0ff03a34b..b26180939 100644 --- a/OpenCL/m10820_a0-optimized.cl +++ b/OpenCL/m10820_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -290,7 +290,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -315,24 +315,24 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -340,17 +340,17 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10820_a0-pure.cl b/OpenCL/m10820_a0-pure.cl index 93d3647dc..c1c1cbab6 100644 --- a/OpenCL/m10820_a0-pure.cl +++ b/OpenCL/m10820_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_RULES ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_RULES ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m10820_a1-optimized.cl b/OpenCL/m10820_a1-optimized.cl index 157ddb4ae..8deb991ef 100644 --- a/OpenCL/m10820_a1-optimized.cl +++ b/OpenCL/m10820_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -346,7 +346,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -371,24 +371,24 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -396,17 +396,17 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -444,7 +444,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10820_a1-pure.cl b/OpenCL/m10820_a1-pure.cl index 6a57af75c..7c403a63c 100644 --- a/OpenCL/m10820_a1-pure.cl +++ b/OpenCL/m10820_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_BASIC ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha384_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,30 +75,30 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha384_ctx_t ctx0; sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha384_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -106,7 +106,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; diff --git a/OpenCL/m10820_a3-optimized.cl b/OpenCL/m10820_a3-optimized.cl index 076558f7f..232bcdd75 100644 --- a/OpenCL/m10820_a3-optimized.cl +++ b/OpenCL/m10820_a3-optimized.cl @@ -138,24 +138,24 @@ DECLSPEC void m10820m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m10820m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -253,10 +253,10 @@ DECLSPEC void m10820s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -268,24 +268,24 @@ DECLSPEC void m10820s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -295,7 +295,7 @@ DECLSPEC void m10820s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -376,7 +376,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -403,7 +403,7 @@ KERNEL_FQ void m10820_m04 (KERN_ATTR_BASIC ()) * main */ - m10820m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10820m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10820_m08 (KERN_ATTR_BASIC ()) @@ -414,7 +414,7 @@ KERNEL_FQ void m10820_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -441,7 +441,7 @@ KERNEL_FQ void m10820_m08 (KERN_ATTR_BASIC ()) * main */ - m10820m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10820m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10820_m16 (KERN_ATTR_BASIC ()) @@ -452,7 +452,7 @@ KERNEL_FQ void m10820_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -479,7 +479,7 @@ KERNEL_FQ void m10820_m16 (KERN_ATTR_BASIC ()) * main */ - m10820m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10820m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) @@ -490,7 +490,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -517,7 +517,7 @@ KERNEL_FQ void m10820_s04 (KERN_ATTR_BASIC ()) * main */ - m10820s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10820s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10820_s08 (KERN_ATTR_BASIC ()) @@ -528,7 +528,7 @@ KERNEL_FQ void m10820_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -555,7 +555,7 @@ KERNEL_FQ void m10820_s08 (KERN_ATTR_BASIC ()) * main */ - m10820s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10820s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10820_s16 (KERN_ATTR_BASIC ()) @@ -566,7 +566,7 @@ KERNEL_FQ void m10820_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -593,5 +593,5 @@ KERNEL_FQ void m10820_s16 (KERN_ATTR_BASIC ()) * main */ - m10820s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10820s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10820_a3-pure.cl b/OpenCL/m10820_a3-pure.cl index 310502a4e..c3ca0cd45 100644 --- a/OpenCL/m10820_a3-pure.cl +++ b/OpenCL/m10820_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_VECTOR ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m10820_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_VECTOR ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m10820_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10830_a0-optimized.cl b/OpenCL/m10830_a0-optimized.cl index d4aaafc21..e75998582 100644 --- a/OpenCL/m10830_a0-optimized.cl +++ b/OpenCL/m10830_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -315,7 +315,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,24 +340,24 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -365,17 +365,17 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10830_a0-pure.cl b/OpenCL/m10830_a0-pure.cl index ee34bce80..8e92686dc 100644 --- a/OpenCL/m10830_a0-pure.cl +++ b/OpenCL/m10830_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m10830_a1-optimized.cl b/OpenCL/m10830_a1-optimized.cl index 02af3fd49..386b1565d 100644 --- a/OpenCL/m10830_a1-optimized.cl +++ b/OpenCL/m10830_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -373,7 +373,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -398,24 +398,24 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -423,17 +423,17 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -471,7 +471,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10830_a1-pure.cl b/OpenCL/m10830_a1-pure.cl index 817c9502d..6add81237 100644 --- a/OpenCL/m10830_a1-pure.cl +++ b/OpenCL/m10830_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha384_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha384_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; diff --git a/OpenCL/m10830_a3-optimized.cl b/OpenCL/m10830_a3-optimized.cl index da9547a88..4bdee9039 100644 --- a/OpenCL/m10830_a3-optimized.cl +++ b/OpenCL/m10830_a3-optimized.cl @@ -138,22 +138,22 @@ DECLSPEC void m10830m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len); @@ -174,7 +174,7 @@ DECLSPEC void m10830m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -186,7 +186,7 @@ DECLSPEC void m10830m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -251,10 +251,10 @@ DECLSPEC void m10830s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -263,7 +263,7 @@ DECLSPEC void m10830s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -321,7 +321,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -348,7 +348,7 @@ KERNEL_FQ void m10830_m04 (KERN_ATTR_VECTOR ()) * main */ - m10830m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10830m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10830_m08 (KERN_ATTR_VECTOR ()) @@ -359,7 +359,7 @@ KERNEL_FQ void m10830_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -386,7 +386,7 @@ KERNEL_FQ void m10830_m08 (KERN_ATTR_VECTOR ()) * main */ - m10830m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10830m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10830_m16 (KERN_ATTR_VECTOR ()) @@ -397,7 +397,7 @@ KERNEL_FQ void m10830_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -424,7 +424,7 @@ KERNEL_FQ void m10830_m16 (KERN_ATTR_VECTOR ()) * main */ - m10830m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10830m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10830_s04 (KERN_ATTR_VECTOR ()) @@ -435,7 +435,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -462,7 +462,7 @@ KERNEL_FQ void m10830_s04 (KERN_ATTR_VECTOR ()) * main */ - m10830s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10830s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10830_s08 (KERN_ATTR_VECTOR ()) @@ -473,7 +473,7 @@ KERNEL_FQ void m10830_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -500,7 +500,7 @@ KERNEL_FQ void m10830_s08 (KERN_ATTR_VECTOR ()) * main */ - m10830s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10830s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10830_s16 (KERN_ATTR_VECTOR ()) @@ -511,7 +511,7 @@ KERNEL_FQ void m10830_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -538,5 +538,5 @@ KERNEL_FQ void m10830_s16 (KERN_ATTR_VECTOR ()) * main */ - m10830s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10830s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10830_a3-pure.cl b/OpenCL/m10830_a3-pure.cl index c59d649f2..226796a91 100644 --- a/OpenCL/m10830_a3-pure.cl +++ b/OpenCL/m10830_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m10830_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m10830_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10840_a0-optimized.cl b/OpenCL/m10840_a0-optimized.cl index c7da41511..323364729 100644 --- a/OpenCL/m10840_a0-optimized.cl +++ b/OpenCL/m10840_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -161,30 +161,30 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -295,7 +295,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -320,24 +320,24 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -345,17 +345,17 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10840_a0-pure.cl b/OpenCL/m10840_a0-pure.cl index 1bdec9010..8fd60c2e4 100644 --- a/OpenCL/m10840_a0-pure.cl +++ b/OpenCL/m10840_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_RULES ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_RULES ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m10840_a1-optimized.cl b/OpenCL/m10840_a1-optimized.cl index 5833df42a..091250ba5 100644 --- a/OpenCL/m10840_a1-optimized.cl +++ b/OpenCL/m10840_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,30 +159,30 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -220,7 +220,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -351,7 +351,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -376,24 +376,24 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -401,17 +401,17 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -449,7 +449,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10840_a1-pure.cl b/OpenCL/m10840_a1-pure.cl index 9e964a1e9..82a6c0152 100644 --- a/OpenCL/m10840_a1-pure.cl +++ b/OpenCL/m10840_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_BASIC ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha384_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_BASIC ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha384_update_global_utf16le_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; diff --git a/OpenCL/m10840_a3-optimized.cl b/OpenCL/m10840_a3-optimized.cl index 965e2dea5..0bfe720b9 100644 --- a/OpenCL/m10840_a3-optimized.cl +++ b/OpenCL/m10840_a3-optimized.cl @@ -138,24 +138,24 @@ DECLSPEC void m10840m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m10840m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -253,10 +253,10 @@ DECLSPEC void m10840s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -268,24 +268,24 @@ DECLSPEC void m10840s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -295,7 +295,7 @@ DECLSPEC void m10840s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -376,7 +376,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -403,7 +403,7 @@ KERNEL_FQ void m10840_m04 (KERN_ATTR_BASIC ()) * main */ - m10840m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10840m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10840_m08 (KERN_ATTR_BASIC ()) @@ -414,7 +414,7 @@ KERNEL_FQ void m10840_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -441,7 +441,7 @@ KERNEL_FQ void m10840_m08 (KERN_ATTR_BASIC ()) * main */ - m10840m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10840m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10840_m16 (KERN_ATTR_BASIC ()) @@ -452,7 +452,7 @@ KERNEL_FQ void m10840_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -479,7 +479,7 @@ KERNEL_FQ void m10840_m16 (KERN_ATTR_BASIC ()) * main */ - m10840m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10840m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) @@ -490,7 +490,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -517,7 +517,7 @@ KERNEL_FQ void m10840_s04 (KERN_ATTR_BASIC ()) * main */ - m10840s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10840s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10840_s08 (KERN_ATTR_BASIC ()) @@ -528,7 +528,7 @@ KERNEL_FQ void m10840_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -555,7 +555,7 @@ KERNEL_FQ void m10840_s08 (KERN_ATTR_BASIC ()) * main */ - m10840s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10840s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10840_s16 (KERN_ATTR_BASIC ()) @@ -566,7 +566,7 @@ KERNEL_FQ void m10840_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -593,5 +593,5 @@ KERNEL_FQ void m10840_s16 (KERN_ATTR_BASIC ()) * main */ - m10840s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10840s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10840_a3-pure.cl b/OpenCL/m10840_a3-pure.cl index b6cc88c68..4fc3612a4 100644 --- a/OpenCL/m10840_a3-pure.cl +++ b/OpenCL/m10840_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_VECTOR ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m10840_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_VECTOR ()) sha384_init (&ctx0); - sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha384_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m10840_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10870_a0-optimized.cl b/OpenCL/m10870_a0-optimized.cl index dae34a666..08982fcf0 100644 --- a/OpenCL/m10870_a0-optimized.cl +++ b/OpenCL/m10870_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,7 +156,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -242,7 +242,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -264,17 +264,17 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m10870_a0-pure.cl b/OpenCL/m10870_a0-pure.cl index 829b3bd3c..2eb1783d5 100644 --- a/OpenCL/m10870_a0-pure.cl +++ b/OpenCL/m10870_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -69,7 +69,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -77,10 +77,10 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m10870_a1-optimized.cl b/OpenCL/m10870_a1-optimized.cl index d39c51697..632300f6a 100644 --- a/OpenCL/m10870_a1-optimized.cl +++ b/OpenCL/m10870_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,7 +154,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -192,7 +192,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -298,7 +298,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -320,17 +320,17 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -368,7 +368,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m10870_a1-pure.cl b/OpenCL/m10870_a1-pure.cl index 38ad6e753..0c1eaabd1 100644 --- a/OpenCL/m10870_a1-pure.cl +++ b/OpenCL/m10870_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; @@ -65,7 +65,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -93,7 +93,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha384_ctx_t ctx = ctx0; diff --git a/OpenCL/m10870_a3-optimized.cl b/OpenCL/m10870_a3-optimized.cl index a075a095f..4a2110609 100644 --- a/OpenCL/m10870_a3-optimized.cl +++ b/OpenCL/m10870_a3-optimized.cl @@ -135,7 +135,7 @@ DECLSPEC void m10870m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -200,10 +200,10 @@ DECLSPEC void m10870s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -212,7 +212,7 @@ DECLSPEC void m10870s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -270,7 +270,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -297,7 +297,7 @@ KERNEL_FQ void m10870_m04 (KERN_ATTR_VECTOR ()) * main */ - m10870m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10870m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10870_m08 (KERN_ATTR_VECTOR ()) @@ -308,7 +308,7 @@ KERNEL_FQ void m10870_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -335,7 +335,7 @@ KERNEL_FQ void m10870_m08 (KERN_ATTR_VECTOR ()) * main */ - m10870m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10870m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10870_m16 (KERN_ATTR_VECTOR ()) @@ -346,7 +346,7 @@ KERNEL_FQ void m10870_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -373,7 +373,7 @@ KERNEL_FQ void m10870_m16 (KERN_ATTR_VECTOR ()) * main */ - m10870m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10870m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10870_s04 (KERN_ATTR_VECTOR ()) @@ -384,7 +384,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -411,7 +411,7 @@ KERNEL_FQ void m10870_s04 (KERN_ATTR_VECTOR ()) * main */ - m10870s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10870s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10870_s08 (KERN_ATTR_VECTOR ()) @@ -422,7 +422,7 @@ KERNEL_FQ void m10870_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -449,7 +449,7 @@ KERNEL_FQ void m10870_s08 (KERN_ATTR_VECTOR ()) * main */ - m10870s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10870s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m10870_s16 (KERN_ATTR_VECTOR ()) @@ -460,7 +460,7 @@ KERNEL_FQ void m10870_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -487,5 +487,5 @@ KERNEL_FQ void m10870_s16 (KERN_ATTR_VECTOR ()) * main */ - m10870s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m10870s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m10870_a3-pure.cl b/OpenCL/m10870_a3-pure.cl index efec0cf01..9af9c944b 100644 --- a/OpenCL/m10870_a3-pure.cl +++ b/OpenCL/m10870_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m10870_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -78,7 +78,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -111,7 +111,7 @@ KERNEL_FQ void m10870_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m10900-pure.cl b/OpenCL/m10900-pure.cl index 6e5b70b57..58917378d 100644 --- a/OpenCL/m10900-pure.cl +++ b/OpenCL/m10900-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m10900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -107,7 +107,7 @@ KERNEL_FQ void m10900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -163,7 +163,7 @@ KERNEL_FQ void m10900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -209,7 +209,7 @@ KERNEL_FQ void m10900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -273,7 +273,7 @@ KERNEL_FQ void m10900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m11000_a0-optimized.cl b/OpenCL/m11000_a0-optimized.cl index 003701a1a..5d44fc36c 100644 --- a/OpenCL/m11000_a0-optimized.cl +++ b/OpenCL/m11000_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,30 +55,30 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -327,7 +327,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -352,24 +352,24 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -377,17 +377,17 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m11000_a0-pure.cl b/OpenCL/m11000_a0-pure.cl index 796c229eb..e3bf6cf18 100644 --- a/OpenCL/m11000_a0-pure.cl +++ b/OpenCL/m11000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -73,7 +73,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -97,13 +97,13 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_RULES ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11000_a1-optimized.cl b/OpenCL/m11000_a1-optimized.cl index ecbda3c11..e2c6a392d 100644 --- a/OpenCL/m11000_a1-optimized.cl +++ b/OpenCL/m11000_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,30 +53,30 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -114,7 +114,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -383,7 +383,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -408,24 +408,24 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -433,17 +433,17 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -481,7 +481,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m11000_a1-pure.cl b/OpenCL/m11000_a1-pure.cl index e4bff8799..4eb92bca5 100644 --- a/OpenCL/m11000_a1-pure.cl +++ b/OpenCL/m11000_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -89,7 +89,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_BASIC ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -97,7 +97,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m11000_a3-optimized.cl b/OpenCL/m11000_a3-optimized.cl index 2f99175f4..9207556e5 100644 --- a/OpenCL/m11000_a3-optimized.cl +++ b/OpenCL/m11000_a3-optimized.cl @@ -32,24 +32,24 @@ DECLSPEC void m11000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -59,7 +59,7 @@ DECLSPEC void m11000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -297,24 +297,24 @@ DECLSPEC void m11000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -324,10 +324,10 @@ DECLSPEC void m11000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -336,7 +336,7 @@ DECLSPEC void m11000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -564,7 +564,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -600,7 +600,7 @@ KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) * main */ - m11000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11000_m08 (KERN_ATTR_BASIC ()) @@ -611,7 +611,7 @@ KERNEL_FQ void m11000_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -647,7 +647,7 @@ KERNEL_FQ void m11000_m08 (KERN_ATTR_BASIC ()) * main */ - m11000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11000_m16 (KERN_ATTR_BASIC ()) @@ -658,7 +658,7 @@ KERNEL_FQ void m11000_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -694,7 +694,7 @@ KERNEL_FQ void m11000_m16 (KERN_ATTR_BASIC ()) * main */ - m11000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11000m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) @@ -705,7 +705,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -741,7 +741,7 @@ KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) * main */ - m11000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11000_s08 (KERN_ATTR_BASIC ()) @@ -752,7 +752,7 @@ KERNEL_FQ void m11000_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -788,7 +788,7 @@ KERNEL_FQ void m11000_s08 (KERN_ATTR_BASIC ()) * main */ - m11000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11000_s16 (KERN_ATTR_BASIC ()) @@ -799,7 +799,7 @@ KERNEL_FQ void m11000_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -835,5 +835,5 @@ KERNEL_FQ void m11000_s16 (KERN_ATTR_BASIC ()) * main */ - m11000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11000s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m11000_a3-pure.cl b/OpenCL/m11000_a3-pure.cl index dd55a73bc..3f630fb02 100644 --- a/OpenCL/m11000_a3-pure.cl +++ b/OpenCL/m11000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m11000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -84,7 +84,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -115,7 +115,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_VECTOR ()) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -123,7 +123,7 @@ KERNEL_FQ void m11000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11100_a0-optimized.cl b/OpenCL/m11100_a0-optimized.cl index 4541b6af8..78ce891d6 100644 --- a/OpenCL/m11100_a0-optimized.cl +++ b/OpenCL/m11100_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -81,7 +81,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_RULES ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * salt @@ -90,22 +90,22 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -389,7 +389,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -415,7 +415,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_RULES ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * salt @@ -424,16 +424,16 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * digest @@ -441,17 +441,17 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m11100_a0-pure.cl b/OpenCL/m11100_a0-pure.cl index ded0500db..06710ebc2 100644 --- a/OpenCL/m11100_a0-pure.cl +++ b/OpenCL/m11100_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -63,21 +63,21 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_RULES ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * base @@ -89,7 +89,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -201,7 +201,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -209,10 +209,10 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -221,21 +221,21 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_RULES ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * base @@ -247,7 +247,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11100_a1-optimized.cl b/OpenCL/m11100_a1-optimized.cl index 59dff625e..dcc4bf264 100644 --- a/OpenCL/m11100_a1-optimized.cl +++ b/OpenCL/m11100_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -79,7 +79,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * salt @@ -88,22 +88,22 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -141,7 +141,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -447,7 +447,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -473,7 +473,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * salt @@ -482,16 +482,16 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * digest @@ -499,17 +499,17 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -547,7 +547,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m11100_a1-pure.cl b/OpenCL/m11100_a1-pure.cl index fde1e82cd..041924b62 100644 --- a/OpenCL/m11100_a1-pure.cl +++ b/OpenCL/m11100_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -61,21 +61,21 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_BASIC ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * base @@ -91,7 +91,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0t; @@ -197,7 +197,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -205,10 +205,10 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -217,21 +217,21 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_BASIC ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * base @@ -247,7 +247,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0t; diff --git a/OpenCL/m11100_a3-optimized.cl b/OpenCL/m11100_a3-optimized.cl index 45afc2489..cf7af1b30 100644 --- a/OpenCL/m11100_a3-optimized.cl +++ b/OpenCL/m11100_a3-optimized.cl @@ -41,7 +41,7 @@ DECLSPEC void m11100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * salt @@ -50,16 +50,16 @@ DECLSPEC void m11100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; u32 s0[4]; u32 s1[4]; @@ -110,7 +110,7 @@ DECLSPEC void m11100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -346,7 +346,7 @@ DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * salt @@ -355,16 +355,16 @@ DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; u32 s0[4]; u32 s1[4]; @@ -415,10 +415,10 @@ DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -427,7 +427,7 @@ DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -678,7 +678,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -718,7 +718,7 @@ KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) * main */ - m11100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m11100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m11100_m08 (KERN_ATTR_BASIC ()) @@ -748,7 +748,7 @@ KERNEL_FQ void m11100_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -788,7 +788,7 @@ KERNEL_FQ void m11100_m08 (KERN_ATTR_BASIC ()) * main */ - m11100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m11100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m11100_m16 (KERN_ATTR_BASIC ()) @@ -818,7 +818,7 @@ KERNEL_FQ void m11100_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -858,7 +858,7 @@ KERNEL_FQ void m11100_m16 (KERN_ATTR_BASIC ()) * main */ - m11100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m11100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) @@ -888,7 +888,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -928,7 +928,7 @@ KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) * main */ - m11100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m11100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m11100_s08 (KERN_ATTR_BASIC ()) @@ -958,7 +958,7 @@ KERNEL_FQ void m11100_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -998,7 +998,7 @@ KERNEL_FQ void m11100_s08 (KERN_ATTR_BASIC ()) * main */ - m11100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m11100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m11100_s16 (KERN_ATTR_BASIC ()) @@ -1028,7 +1028,7 @@ KERNEL_FQ void m11100_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1068,5 +1068,5 @@ KERNEL_FQ void m11100_s16 (KERN_ATTR_BASIC ()) * main */ - m11100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m11100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m11100_a3-pure.cl b/OpenCL/m11100_a3-pure.cl index a1a4791ca..852e46492 100644 --- a/OpenCL/m11100_a3-pure.cl +++ b/OpenCL/m11100_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -61,21 +61,21 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_VECTOR ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * base @@ -96,7 +96,7 @@ KERNEL_FQ void m11100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -240,7 +240,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -248,10 +248,10 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -260,21 +260,21 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_VECTOR ()) u32 challenge; - challenge = salt_bufs[SALT_POS].salt_buf[0]; + challenge = salt_bufs[SALT_POS_HOST].salt_buf[0]; u32 salt_buf0[4]; u32 salt_buf1[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[1]; // not a bug, see challenge - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[4]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[5]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[6]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[7]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[8]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[1]; // not a bug, see challenge + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[8]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len - 4; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len - 4; /** * base @@ -295,7 +295,7 @@ KERNEL_FQ void m11100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11200_a0-optimized.cl b/OpenCL/m11200_a0-optimized.cl index 08e819b49..baab5f44f 100644 --- a/OpenCL/m11200_a0-optimized.cl +++ b/OpenCL/m11200_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -52,17 +52,17 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_RULES ()) u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -492,7 +492,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -514,11 +514,11 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_RULES ()) u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); /** * digest @@ -526,17 +526,17 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m11200_a0-pure.cl b/OpenCL/m11200_a0-pure.cl index d0e734a28..bc3c5df28 100644 --- a/OpenCL/m11200_a0-pure.cl +++ b/OpenCL/m11200_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -141,7 +141,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -149,10 +149,10 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -165,13 +165,13 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11200_a1-optimized.cl b/OpenCL/m11200_a1-optimized.cl index dfbfddb4b..ce863c119 100644 --- a/OpenCL/m11200_a1-optimized.cl +++ b/OpenCL/m11200_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,17 +50,17 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -98,7 +98,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -548,7 +548,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -570,11 +570,11 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); /** * digest @@ -582,17 +582,17 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -630,7 +630,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m11200_a1-pure.cl b/OpenCL/m11200_a1-pure.cl index 7d07d1594..1e78457a9 100644 --- a/OpenCL/m11200_a1-pure.cl +++ b/OpenCL/m11200_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx2l; @@ -45,7 +45,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx2 = ctx2l; @@ -137,7 +137,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -145,10 +145,10 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -159,7 +159,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx2l; @@ -171,7 +171,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx2 = ctx2l; diff --git a/OpenCL/m11200_a3-optimized.cl b/OpenCL/m11200_a3-optimized.cl index 8399f53a9..183ae1f46 100644 --- a/OpenCL/m11200_a3-optimized.cl +++ b/OpenCL/m11200_a3-optimized.cl @@ -29,11 +29,11 @@ DECLSPEC void m11200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); /** * loop @@ -41,7 +41,7 @@ DECLSPEC void m11200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -459,11 +459,11 @@ DECLSPEC void m11200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf[5]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); - salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[3]); - salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[4]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); + salt_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[3]); + salt_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[4]); /** * digest @@ -471,10 +471,10 @@ DECLSPEC void m11200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -483,7 +483,7 @@ DECLSPEC void m11200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -894,7 +894,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -934,7 +934,7 @@ KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) * main */ - m11200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11200_m08 (KERN_ATTR_BASIC ()) @@ -945,7 +945,7 @@ KERNEL_FQ void m11200_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -985,7 +985,7 @@ KERNEL_FQ void m11200_m08 (KERN_ATTR_BASIC ()) * main */ - m11200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11200_m16 (KERN_ATTR_BASIC ()) @@ -996,7 +996,7 @@ KERNEL_FQ void m11200_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1036,7 +1036,7 @@ KERNEL_FQ void m11200_m16 (KERN_ATTR_BASIC ()) * main */ - m11200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) @@ -1047,7 +1047,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1087,7 +1087,7 @@ KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) * main */ - m11200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11200_s08 (KERN_ATTR_BASIC ()) @@ -1098,7 +1098,7 @@ KERNEL_FQ void m11200_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1138,7 +1138,7 @@ KERNEL_FQ void m11200_s08 (KERN_ATTR_BASIC ()) * main */ - m11200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11200_s16 (KERN_ATTR_BASIC ()) @@ -1149,7 +1149,7 @@ KERNEL_FQ void m11200_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1189,5 +1189,5 @@ KERNEL_FQ void m11200_s16 (KERN_ATTR_BASIC ()) * main */ - m11200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m11200_a3-pure.cl b/OpenCL/m11200_a3-pure.cl index ad6c840db..1de719b9e 100644 --- a/OpenCL/m11200_a3-pure.cl +++ b/OpenCL/m11200_a3-pure.cl @@ -35,7 +35,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -54,7 +54,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -62,7 +62,7 @@ KERNEL_FQ void m11200_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -164,7 +164,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -172,10 +172,10 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -195,7 +195,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -203,7 +203,7 @@ KERNEL_FQ void m11200_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11300-pure.cl b/OpenCL/m11300-pure.cl index 9097b766d..8868bf057 100644 --- a/OpenCL/m11300-pure.cl +++ b/OpenCL/m11300-pure.cl @@ -97,7 +97,7 @@ KERNEL_FQ void m11300_init (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t ctx; @@ -105,7 +105,7 @@ KERNEL_FQ void m11300_init (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ sha512_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); - sha512_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_final (&ctx); @@ -123,7 +123,7 @@ KERNEL_FQ void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x t0 = pack64v (tmps, dgst, gid, 0); u64x t1 = pack64v (tmps, dgst, gid, 1); @@ -134,7 +134,7 @@ KERNEL_FQ void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ u64x t6 = pack64v (tmps, dgst, gid, 6); u64x t7 = pack64v (tmps, dgst, gid, 7); - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { u32x w0[4]; u32x w1[4]; @@ -268,7 +268,7 @@ KERNEL_FQ void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * real code @@ -296,9 +296,9 @@ KERNEL_FQ void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ key[6] = h32_from_64_S (dgst[3]); key[7] = l32_from_64_S (dgst[3]); - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; #define KEYLEN 60 @@ -353,7 +353,7 @@ KERNEL_FQ void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_ { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } diff --git a/OpenCL/m11400_a0-pure.cl b/OpenCL/m11400_a0-pure.cl index 28324ca23..2a0ca2343 100644 --- a/OpenCL/m11400_a0-pure.cl +++ b/OpenCL/m11400_a0-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -77,13 +77,13 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -123,7 +123,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) ctx.len = 32; - md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].esalt_buf, esalt_bufs[DIGESTS_OFFSET].esalt_len); + md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_len); md5_final (&ctx); @@ -163,7 +163,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -171,10 +171,10 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -187,13 +187,13 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) md5_init (&ctx0); - md5_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -233,7 +233,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) ctx.len = 32; - md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].esalt_buf, esalt_bufs[DIGESTS_OFFSET].esalt_len); + md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_len); md5_final (&ctx); diff --git a/OpenCL/m11400_a1-pure.cl b/OpenCL/m11400_a1-pure.cl index dcdaf8369..7b2a15143 100644 --- a/OpenCL/m11400_a1-pure.cl +++ b/OpenCL/m11400_a1-pure.cl @@ -63,7 +63,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_ESALT (sip_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,7 +73,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_ESALT (sip_t)) md5_init (&ctx0); - md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); md5_update_global (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -81,7 +81,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_ESALT (sip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_ESALT (sip_t)) ctx.len = 32; - md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].esalt_buf, esalt_bufs[DIGESTS_OFFSET].esalt_len); + md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_len); md5_final (&ctx); @@ -157,7 +157,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -165,10 +165,10 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -179,7 +179,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t)) md5_init (&ctx0); - md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); md5_update_global (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -187,7 +187,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -223,7 +223,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t)) ctx.len = 32; - md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].esalt_buf, esalt_bufs[DIGESTS_OFFSET].esalt_len); + md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].esalt_len); md5_final (&ctx); diff --git a/OpenCL/m11400_a3-pure.cl b/OpenCL/m11400_a3-pure.cl index ae8e68fbf..ea6b11da1 100644 --- a/OpenCL/m11400_a3-pure.cl +++ b/OpenCL/m11400_a3-pure.cl @@ -63,7 +63,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -78,20 +78,20 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) w[idx] = pws[gid].i[idx]; } - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].esalt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].esalt_len; u32x esalt_buf[256] = { 0 }; for (u32 i = 0, idx = 0; i < esalt_len; i += 4, idx += 1) { - esalt_buf[idx] = esalt_bufs[DIGESTS_OFFSET].esalt_buf[idx]; + esalt_buf[idx] = esalt_bufs[DIGESTS_OFFSET_HOST].esalt_buf[idx]; } md5_ctx_t ctx0; md5_init (&ctx0); - md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); /** * loop @@ -99,7 +99,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -183,7 +183,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -191,10 +191,10 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -210,20 +210,20 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) w[idx] = pws[gid].i[idx]; } - const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET].esalt_len; + const u32 esalt_len = esalt_bufs[DIGESTS_OFFSET_HOST].esalt_len; u32x esalt_buf[256] = { 0 }; for (u32 i = 0, idx = 0; i < esalt_len; i += 4, idx += 1) { - esalt_buf[idx] = esalt_bufs[DIGESTS_OFFSET].esalt_buf[idx]; + esalt_buf[idx] = esalt_bufs[DIGESTS_OFFSET_HOST].esalt_buf[idx]; } md5_ctx_t ctx0; md5_init (&ctx0); - md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + md5_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); /** * loop @@ -231,7 +231,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl index 1fd7ab2cb..b4f255cf6 100644 --- a/OpenCL/m11500_a0-optimized.cl +++ b/OpenCL/m11500_a0-optimized.cl @@ -149,7 +149,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -169,13 +169,13 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -237,7 +237,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -257,7 +257,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -265,7 +265,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -275,7 +275,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m11500_a1-optimized.cl b/OpenCL/m11500_a1-optimized.cl index c9912761b..0f0f492b1 100644 --- a/OpenCL/m11500_a1-optimized.cl +++ b/OpenCL/m11500_a1-optimized.cl @@ -147,7 +147,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -167,13 +167,13 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -211,7 +211,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -295,7 +295,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -315,7 +315,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -323,7 +323,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -333,7 +333,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -371,7 +371,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m11500_a3-optimized.cl b/OpenCL/m11500_a3-optimized.cl index 4ae08702e..380bdb4d6 100644 --- a/OpenCL/m11500_a3-optimized.cl +++ b/OpenCL/m11500_a3-optimized.cl @@ -146,7 +146,7 @@ DECLSPEC void m11500m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -154,7 +154,7 @@ DECLSPEC void m11500m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -204,7 +204,7 @@ DECLSPEC void m11500s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -212,7 +212,7 @@ DECLSPEC void m11500s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -224,7 +224,7 @@ DECLSPEC void m11500s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -269,7 +269,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -296,7 +296,7 @@ KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) * main */ - m11500m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11500m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11500_m08 (KERN_ATTR_BASIC ()) @@ -307,7 +307,7 @@ KERNEL_FQ void m11500_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -334,7 +334,7 @@ KERNEL_FQ void m11500_m08 (KERN_ATTR_BASIC ()) * main */ - m11500m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11500m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11500_m16 (KERN_ATTR_BASIC ()) @@ -345,7 +345,7 @@ KERNEL_FQ void m11500_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -372,7 +372,7 @@ KERNEL_FQ void m11500_m16 (KERN_ATTR_BASIC ()) * main */ - m11500m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11500m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) @@ -383,7 +383,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -410,7 +410,7 @@ KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) * main */ - m11500s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11500s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11500_s08 (KERN_ATTR_BASIC ()) @@ -421,7 +421,7 @@ KERNEL_FQ void m11500_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -448,7 +448,7 @@ KERNEL_FQ void m11500_s08 (KERN_ATTR_BASIC ()) * main */ - m11500s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11500s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11500_s16 (KERN_ATTR_BASIC ()) @@ -459,7 +459,7 @@ KERNEL_FQ void m11500_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -486,5 +486,5 @@ KERNEL_FQ void m11500_s16 (KERN_ATTR_BASIC ()) * main */ - m11500s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11500s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m11600-optimized.cl b/OpenCL/m11600-optimized.cl index 05571d285..0fdf30a40 100644 --- a/OpenCL/m11600-optimized.cl +++ b/OpenCL/m11600-optimized.cl @@ -48,7 +48,7 @@ KERNEL_FQ void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].h[0] = SHA256M_A; tmps[gid].h[1] = SHA256M_B; @@ -66,7 +66,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf[5]; @@ -88,7 +88,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo for (u32 i = 0; i < LARGEBLOCK_ELEMS; i++) largeblock[i] = 0; - u32 loop_pos_pos = loop_pos; + u32 loop_pos_pos = LOOP_POS; for (u32 i = 0, p = 0; i < 64; i++) { @@ -121,9 +121,9 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo const int iter64 = (pw_len * 2) + 8; - loop_pos_pos = loop_pos; + loop_pos_pos = LOOP_POS; - for (u32 i = 0; i < loop_cnt; i += 64) + for (u32 i = 0; i < LOOP_CNT; i += 64) { // iteration set for (u32 i = 0, p = pw_len * 2; i < 64; i++, p += iter64) @@ -166,7 +166,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo } } - tmps[gid].len += loop_cnt * iter64; + tmps[gid].len += LOOP_CNT * iter64; tmps[gid].h[0] = h[0]; tmps[gid].h[1] = h[1]; @@ -182,7 +182,7 @@ KERNEL_FQ void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_h { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * context load @@ -241,13 +241,13 @@ KERNEL_FQ void m11600_comp (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (hooks[gid].hook_success == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m11600-pure.cl b/OpenCL/m11600-pure.cl index d321aee3a..05022d7e5 100644 --- a/OpenCL/m11600-pure.cl +++ b/OpenCL/m11600-pure.cl @@ -148,7 +148,7 @@ KERNEL_FQ void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * context save @@ -195,7 +195,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pw_len = pws[gid].pw_len; @@ -244,7 +244,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo * base */ - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { sha256_update_utf16le_swap (&ctx, w, pw_len); @@ -290,7 +290,7 @@ KERNEL_FQ void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_h { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * context load @@ -349,13 +349,13 @@ KERNEL_FQ void m11600_comp (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (hooks[gid].hook_success == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl index 5962c37a5..560a4f77a 100644 --- a/OpenCL/m11700_a0-optimized.cl +++ b/OpenCL/m11700_a0-optimized.cl @@ -117,7 +117,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -141,7 +141,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -275,7 +275,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -301,17 +301,17 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m11700_a0-pure.cl b/OpenCL/m11700_a0-pure.cl index c4285aba6..10d260695 100644 --- a/OpenCL/m11700_a0-pure.cl +++ b/OpenCL/m11700_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -66,7 +66,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -127,7 +127,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -135,10 +135,10 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -151,7 +151,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11700_a1-optimized.cl b/OpenCL/m11700_a1-optimized.cl index edfdaae9c..2344544cd 100644 --- a/OpenCL/m11700_a1-optimized.cl +++ b/OpenCL/m11700_a1-optimized.cl @@ -115,7 +115,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -139,7 +139,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -177,7 +177,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -331,7 +331,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -357,17 +357,17 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -405,7 +405,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m11700_a1-pure.cl b/OpenCL/m11700_a1-pure.cl index a1402e355..ae3d2ace1 100644 --- a/OpenCL/m11700_a1-pure.cl +++ b/OpenCL/m11700_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,7 +68,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { streebog256_ctx_t ctx = ctx0; @@ -123,7 +123,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -131,10 +131,10 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -151,7 +151,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { streebog256_ctx_t ctx = ctx0; diff --git a/OpenCL/m11700_a3-optimized.cl b/OpenCL/m11700_a3-optimized.cl index c7e5288f3..c63df3b8e 100644 --- a/OpenCL/m11700_a3-optimized.cl +++ b/OpenCL/m11700_a3-optimized.cl @@ -91,7 +91,7 @@ DECLSPEC void m11700m (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_le u32 w0l = w[0]; - 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); @@ -174,10 +174,10 @@ DECLSPEC void m11700s (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_le const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,7 +186,7 @@ DECLSPEC void m11700s (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_le u32 w0l = w[0]; - 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); @@ -284,7 +284,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -315,7 +315,7 @@ KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) * main */ - m11700m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11700m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11700_m08 (KERN_ATTR_BASIC ()) @@ -348,7 +348,7 @@ KERNEL_FQ void m11700_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -379,7 +379,7 @@ KERNEL_FQ void m11700_m08 (KERN_ATTR_BASIC ()) * main */ - m11700m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11700m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11700_m16 (KERN_ATTR_BASIC ()) @@ -412,7 +412,7 @@ KERNEL_FQ void m11700_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -443,7 +443,7 @@ KERNEL_FQ void m11700_m16 (KERN_ATTR_BASIC ()) * main */ - m11700m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11700m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) @@ -476,7 +476,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -507,7 +507,7 @@ KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) * main */ - m11700s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11700s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11700_s08 (KERN_ATTR_BASIC ()) @@ -540,7 +540,7 @@ KERNEL_FQ void m11700_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -571,7 +571,7 @@ KERNEL_FQ void m11700_s08 (KERN_ATTR_BASIC ()) * main */ - m11700s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11700s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11700_s16 (KERN_ATTR_BASIC ()) @@ -604,7 +604,7 @@ KERNEL_FQ void m11700_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -635,5 +635,5 @@ KERNEL_FQ void m11700_s16 (KERN_ATTR_BASIC ()) * main */ - m11700s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11700s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m11700_a3-pure.cl b/OpenCL/m11700_a3-pure.cl index cac414c4b..308c1d78d 100644 --- a/OpenCL/m11700_a3-pure.cl +++ b/OpenCL/m11700_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,7 +73,7 @@ KERNEL_FQ void m11700_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -136,7 +136,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -144,10 +144,10 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -169,7 +169,7 @@ KERNEL_FQ void m11700_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11750_a0-pure.cl b/OpenCL/m11750_a0-pure.cl index 0a652e3b7..67508a5d1 100644 --- a/OpenCL/m11750_a0-pure.cl +++ b/OpenCL/m11750_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -62,20 +62,20 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -136,7 +136,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -144,10 +144,10 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -156,20 +156,20 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11750_a1-pure.cl b/OpenCL/m11750_a1-pure.cl index 197326cc3..621f46f25 100644 --- a/OpenCL/m11750_a1-pure.cl +++ b/OpenCL/m11750_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,20 +67,20 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -159,7 +159,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -167,10 +167,10 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,20 +186,20 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m11750_a3-pure.cl b/OpenCL/m11750_a3-pure.cl index feefbbf3f..808a918e8 100644 --- a/OpenCL/m11750_a3-pure.cl +++ b/OpenCL/m11750_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -82,7 +82,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -145,7 +145,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -153,10 +153,10 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -172,13 +172,13 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -187,7 +187,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11760_a0-pure.cl b/OpenCL/m11760_a0-pure.cl index 0f75dc13c..4302f3d2b 100644 --- a/OpenCL/m11760_a0-pure.cl +++ b/OpenCL/m11760_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -62,13 +62,13 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog256_hmac_ctx_t ctx0; @@ -79,7 +79,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -138,7 +138,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -146,10 +146,10 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -158,13 +158,13 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog256_hmac_ctx_t ctx0; @@ -175,7 +175,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11760_a1-pure.cl b/OpenCL/m11760_a1-pure.cl index a08541a42..1e3e51926 100644 --- a/OpenCL/m11760_a1-pure.cl +++ b/OpenCL/m11760_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog256_hmac_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -161,7 +161,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -169,10 +169,10 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -188,13 +188,13 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog256_hmac_ctx_t ctx0; @@ -205,7 +205,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m11760_a3-pure.cl b/OpenCL/m11760_a3-pure.cl index e4f039ee3..cf4033f63 100644 --- a/OpenCL/m11760_a3-pure.cl +++ b/OpenCL/m11760_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog256_hmac_ctx_vector_t ctx0; @@ -86,7 +86,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -147,7 +147,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -155,10 +155,10 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -174,13 +174,13 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog256_hmac_ctx_vector_t ctx0; @@ -193,7 +193,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl index 669cfa83c..6ec34e561 100644 --- a/OpenCL/m11800_a0-optimized.cl +++ b/OpenCL/m11800_a0-optimized.cl @@ -117,7 +117,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -141,7 +141,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -275,7 +275,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -301,17 +301,17 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m11800_a0-pure.cl b/OpenCL/m11800_a0-pure.cl index 56f03bc57..e881f0bff 100644 --- a/OpenCL/m11800_a0-pure.cl +++ b/OpenCL/m11800_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -66,7 +66,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -127,7 +127,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -135,10 +135,10 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -151,7 +151,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11800_a1-optimized.cl b/OpenCL/m11800_a1-optimized.cl index 2fd5d57c4..ab94377ba 100644 --- a/OpenCL/m11800_a1-optimized.cl +++ b/OpenCL/m11800_a1-optimized.cl @@ -115,7 +115,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -139,7 +139,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -177,7 +177,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -331,7 +331,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -357,17 +357,17 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -405,7 +405,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m11800_a1-pure.cl b/OpenCL/m11800_a1-pure.cl index c69949fc7..c3536fe88 100644 --- a/OpenCL/m11800_a1-pure.cl +++ b/OpenCL/m11800_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,7 +68,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { streebog512_ctx_t ctx = ctx0; @@ -123,7 +123,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -131,10 +131,10 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -151,7 +151,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { streebog512_ctx_t ctx = ctx0; diff --git a/OpenCL/m11800_a3-optimized.cl b/OpenCL/m11800_a3-optimized.cl index 68259c3b5..a84cff195 100644 --- a/OpenCL/m11800_a3-optimized.cl +++ b/OpenCL/m11800_a3-optimized.cl @@ -91,7 +91,7 @@ DECLSPEC void m11800m (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_le u32 w0l = w[0]; - 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); @@ -174,10 +174,10 @@ DECLSPEC void m11800s (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_le const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,7 +186,7 @@ DECLSPEC void m11800s (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_le u32 w0l = w[0]; - 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); @@ -284,7 +284,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -315,7 +315,7 @@ KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) * main */ - m11800m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11800m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11800_m08 (KERN_ATTR_BASIC ()) @@ -348,7 +348,7 @@ KERNEL_FQ void m11800_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -379,7 +379,7 @@ KERNEL_FQ void m11800_m08 (KERN_ATTR_BASIC ()) * main */ - m11800m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11800m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11800_m16 (KERN_ATTR_BASIC ()) @@ -412,7 +412,7 @@ KERNEL_FQ void m11800_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -443,7 +443,7 @@ KERNEL_FQ void m11800_m16 (KERN_ATTR_BASIC ()) * main */ - m11800m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11800m (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) @@ -476,7 +476,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -507,7 +507,7 @@ KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) * main */ - m11800s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11800s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11800_s08 (KERN_ATTR_BASIC ()) @@ -540,7 +540,7 @@ KERNEL_FQ void m11800_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -571,7 +571,7 @@ KERNEL_FQ void m11800_s08 (KERN_ATTR_BASIC ()) * main */ - m11800s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11800s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m11800_s16 (KERN_ATTR_BASIC ()) @@ -604,7 +604,7 @@ KERNEL_FQ void m11800_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -635,5 +635,5 @@ KERNEL_FQ void m11800_s16 (KERN_ATTR_BASIC ()) * main */ - m11800s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m11800s (s_sbob_sl64, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m11800_a3-pure.cl b/OpenCL/m11800_a3-pure.cl index bfab52c6c..139534859 100644 --- a/OpenCL/m11800_a3-pure.cl +++ b/OpenCL/m11800_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,7 +73,7 @@ KERNEL_FQ void m11800_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -136,7 +136,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -144,10 +144,10 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -169,7 +169,7 @@ KERNEL_FQ void m11800_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11850_a0-pure.cl b/OpenCL/m11850_a0-pure.cl index 12154271f..bac9e9850 100644 --- a/OpenCL/m11850_a0-pure.cl +++ b/OpenCL/m11850_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -62,20 +62,20 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -136,7 +136,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -144,10 +144,10 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -156,20 +156,20 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11850_a1-pure.cl b/OpenCL/m11850_a1-pure.cl index 8d9c11239..ab3e39343 100644 --- a/OpenCL/m11850_a1-pure.cl +++ b/OpenCL/m11850_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,20 +67,20 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -159,7 +159,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -167,10 +167,10 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,20 +186,20 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m11850_a3-pure.cl b/OpenCL/m11850_a3-pure.cl index 7dbfc2f60..ef375e832 100644 --- a/OpenCL/m11850_a3-pure.cl +++ b/OpenCL/m11850_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -82,7 +82,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -145,7 +145,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -153,10 +153,10 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -172,13 +172,13 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -187,7 +187,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11860_a0-pure.cl b/OpenCL/m11860_a0-pure.cl index b5e46cbc0..5bdaab01c 100644 --- a/OpenCL/m11860_a0-pure.cl +++ b/OpenCL/m11860_a0-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -62,13 +62,13 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog512_hmac_ctx_t ctx0; @@ -79,7 +79,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -138,7 +138,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -146,10 +146,10 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -158,13 +158,13 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog512_hmac_ctx_t ctx0; @@ -175,7 +175,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m11860_a1-pure.cl b/OpenCL/m11860_a1-pure.cl index 25ec1e242..d7ff33c36 100644 --- a/OpenCL/m11860_a1-pure.cl +++ b/OpenCL/m11860_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog512_hmac_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -161,7 +161,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -169,10 +169,10 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -188,13 +188,13 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ()) w[idx] = hc_swap32_S (pws[gid].i[idx]); } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog512_hmac_ctx_t ctx0; @@ -205,7 +205,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m11860_a3-pure.cl b/OpenCL/m11860_a3-pure.cl index fd41c9349..bdb20ec48 100644 --- a/OpenCL/m11860_a3-pure.cl +++ b/OpenCL/m11860_a3-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog512_hmac_ctx_vector_t ctx0; @@ -86,7 +86,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -147,7 +147,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -155,10 +155,10 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -174,13 +174,13 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } streebog512_hmac_ctx_vector_t ctx0; @@ -193,7 +193,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m11900-pure.cl b/OpenCL/m11900-pure.cl index 34bbf962d..fb2fae2c6 100644 --- a/OpenCL/m11900-pure.cl +++ b/OpenCL/m11900-pure.cl @@ -75,7 +75,7 @@ KERNEL_FQ void m11900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; md5_hmac_ctx_t md5_hmac_ctx; @@ -91,7 +91,7 @@ KERNEL_FQ void m11900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t tmps[gid].opad[2] = md5_hmac_ctx.opad.h[2]; tmps[gid].opad[3] = md5_hmac_ctx.opad.h[3]; - md5_hmac_update_global (&md5_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_hmac_update_global (&md5_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 4; i += 4, j += 1) { @@ -139,7 +139,7 @@ KERNEL_FQ void m11900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[4]; u32x opad[4]; @@ -169,7 +169,7 @@ KERNEL_FQ void m11900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t out[2] = packv (tmps, out, gid, i + 2); out[3] = packv (tmps, out, gid, i + 3); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -221,7 +221,7 @@ KERNEL_FQ void m11900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m12000-pure.cl b/OpenCL/m12000-pure.cl index 8c0b790ae..741cc95f2 100644 --- a/OpenCL/m12000-pure.cl +++ b/OpenCL/m12000-pure.cl @@ -77,7 +77,7 @@ KERNEL_FQ void m12000_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1 const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -95,7 +95,7 @@ KERNEL_FQ void m12000_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1 tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -145,7 +145,7 @@ KERNEL_FQ void m12000_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1 { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -179,7 +179,7 @@ KERNEL_FQ void m12000_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1 out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -234,7 +234,7 @@ KERNEL_FQ void m12000_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1 const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m12200-pure.cl b/OpenCL/m12200-pure.cl index abd3b685c..d99e0a67c 100644 --- a/OpenCL/m12200-pure.cl +++ b/OpenCL/m12200-pure.cl @@ -31,13 +31,13 @@ KERNEL_FQ void m12200_init (KERN_ATTR_TMPS (ecryptfs_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t ctx; sha512_init (&ctx); - sha512_update_global (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -57,7 +57,7 @@ KERNEL_FQ void m12200_loop (KERN_ATTR_TMPS (ecryptfs_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x t0 = pack64v (tmps, out, gid, 0); u64x t1 = pack64v (tmps, out, gid, 1); @@ -110,7 +110,7 @@ KERNEL_FQ void m12200_loop (KERN_ATTR_TMPS (ecryptfs_tmp_t)) w7[2] = 0; w7[3] = 64 * 8; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { w0[0] = h32_from_64 (t0); w0[1] = l32_from_64 (t0); @@ -170,7 +170,7 @@ KERNEL_FQ void m12200_comp (KERN_ATTR_TMPS (ecryptfs_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m12300-pure.cl b/OpenCL/m12300-pure.cl index 8bfd2bd5f..5971c6d45 100644 --- a/OpenCL/m12300-pure.cl +++ b/OpenCL/m12300-pure.cl @@ -93,7 +93,7 @@ KERNEL_FQ void m12300_init (KERN_ATTR_TMPS (oraclet_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -117,7 +117,7 @@ KERNEL_FQ void m12300_init (KERN_ATTR_TMPS (oraclet_tmp_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 w0[4]; u32 w1[4]; @@ -228,7 +228,7 @@ KERNEL_FQ void m12300_loop (KERN_ATTR_TMPS (oraclet_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -274,7 +274,7 @@ KERNEL_FQ void m12300_loop (KERN_ATTR_TMPS (oraclet_tmp_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -358,7 +358,7 @@ KERNEL_FQ void m12300_comp (KERN_ATTR_TMPS (oraclet_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -421,7 +421,7 @@ KERNEL_FQ void m12300_comp (KERN_ATTR_TMPS (oraclet_tmp_t)) sha512_update_128 (&ctx, w0, w1, w2, w3, w4, w5, w6, w7, 64); - sha512_update_global (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_final (&ctx); diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl index c39cc46e4..e328cbdd9 100644 --- a/OpenCL/m12400-pure.cl +++ b/OpenCL/m12400-pure.cl @@ -537,7 +537,7 @@ KERNEL_FQ void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * word @@ -673,7 +673,7 @@ KERNEL_FQ void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -722,9 +722,9 @@ KERNEL_FQ void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) iv[0] = tmps[gid].iv[0]; iv[1] = tmps[gid].iv[1]; - const u32 mask = salt_bufs[SALT_POS].salt_buf[0]; + const u32 mask = salt_bufs[SALT_POS_HOST].salt_buf[0]; - _des_crypt_encrypt (iv, mask, loop_cnt, Kc, Kd, s_SPtrans); + _des_crypt_encrypt (iv, mask, LOOP_CNT, Kc, Kd, s_SPtrans); tmps[gid].iv[0] = iv[0]; tmps[gid].iv[1] = iv[1]; @@ -738,7 +738,7 @@ KERNEL_FQ void m12400_comp (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m12500-optimized.cl b/OpenCL/m12500-optimized.cl index 63ff55dd5..692a2c285 100644 --- a/OpenCL/m12500-optimized.cl +++ b/OpenCL/m12500-optimized.cl @@ -39,7 +39,7 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].dgst[0][0] = SHA1M_A; tmps[gid].dgst[0][1] = SHA1M_B; @@ -52,7 +52,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf[10]; @@ -71,8 +71,8 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; const u32 salt_len = 8; @@ -96,7 +96,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) PUTCHAR_BE (largeblock, p, GETCHAR (salt_buf, j)); } - PUTCHAR_BE (largeblock, p + 2, (loop_pos >> 16) & 0xff); + PUTCHAR_BE (largeblock, p + 2, (LOOP_POS >> 16) & 0xff); p += 3; } @@ -105,7 +105,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) const u32 p3 = pw_len + salt_len + 3; - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); u32 dgst[5]; @@ -115,7 +115,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) dgst[3] = tmps[gid].dgst[init_pos][3]; dgst[4] = tmps[gid].dgst[init_pos][4]; - u32 iter = loop_pos; + u32 iter = LOOP_POS; for (u32 i = 0; i < 256; i++) { @@ -294,7 +294,7 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -351,10 +351,10 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) u32 data[4]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; u32 out[4]; @@ -386,8 +386,8 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; //const u32 salt_len = 8; diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl index 020ac1619..402384531 100644 --- a/OpenCL/m12500-pure.cl +++ b/OpenCL/m12500-pure.cl @@ -736,7 +736,7 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].dgst[0] = SHA1M_A; tmps[gid].dgst[1] = SHA1M_B; @@ -762,8 +762,8 @@ KERNEL_FQ void m12500_init (KERN_ATTR_TMPS (rar3_tmp_t)) u32 salt_buf[3]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); // swap needed due to -O kernel - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); // swap needed due to -O kernel + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); salt_buf[2] = 0; // switch buffer by offset (can only be 0 or 2 because of utf16): @@ -798,7 +798,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -821,7 +821,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) // update IV: - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); sha1_ctx_t ctx_iv; @@ -833,11 +833,11 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) ctx_iv.h[3] = tmps[gid].dgst[3]; ctx_iv.h[4] = tmps[gid].dgst[4]; - ctx_iv.len = loop_pos * p3; + ctx_iv.len = LOOP_POS * p3; sha1_update_rar29 (&ctx_iv, w, pw_salt_len); - memcat8c_be (ctx_iv.w0, ctx_iv.w1, ctx_iv.w2, ctx_iv.w3, ctx_iv.len, hc_swap32_S (loop_pos), ctx_iv.h); + memcat8c_be (ctx_iv.w0, ctx_iv.w1, ctx_iv.w2, ctx_iv.w3, ctx_iv.len, hc_swap32_S (LOOP_POS), ctx_iv.h); ctx_iv.len += 3; @@ -884,7 +884,7 @@ KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS (rar3_tmp_t)) // main loop: - for (u32 i = 0, j = (loop_pos + 1); i < 16383; i++, j++) + for (u32 i = 0, j = (LOOP_POS + 1); i < 16383; i++, j++) { sha1_update_rar29 (&ctx, w, pw_salt_len); @@ -964,7 +964,7 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1023,10 +1023,10 @@ KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS (rar3_tmp_t)) u32 data[4]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; u32 out[4]; diff --git a/OpenCL/m12600_a0-optimized.cl b/OpenCL/m12600_a0-optimized.cl index f5c69c943..9031b842c 100644 --- a/OpenCL/m12600_a0-optimized.cl +++ b/OpenCL/m12600_a0-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,20 +82,20 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_RULES ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -396,7 +396,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -422,14 +422,14 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_RULES ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * digest @@ -437,17 +437,17 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m12600_a0-pure.cl b/OpenCL/m12600_a0-pure.cl index 5fcc2dc33..d6b97da2c 100644 --- a/OpenCL/m12600_a0-pure.cl +++ b/OpenCL/m12600_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -64,14 +64,14 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_RULES ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * base @@ -83,7 +83,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -192,7 +192,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -200,10 +200,10 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -212,14 +212,14 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_RULES ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * base @@ -231,7 +231,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m12600_a1-optimized.cl b/OpenCL/m12600_a1-optimized.cl index 3a92cc7a9..bb64693d2 100644 --- a/OpenCL/m12600_a1-optimized.cl +++ b/OpenCL/m12600_a1-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,20 +80,20 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -131,7 +131,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -452,7 +452,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -478,14 +478,14 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * digest @@ -493,17 +493,17 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -541,7 +541,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m12600_a1-pure.cl b/OpenCL/m12600_a1-pure.cl index 24c232758..cfdd72fed 100644 --- a/OpenCL/m12600_a1-pure.cl +++ b/OpenCL/m12600_a1-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -62,14 +62,14 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_BASIC ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * base @@ -85,7 +85,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; @@ -188,7 +188,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -196,10 +196,10 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -208,14 +208,14 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_BASIC ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * base @@ -231,7 +231,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m12600_a3-optimized.cl b/OpenCL/m12600_a3-optimized.cl index f905d0e06..65807a720 100644 --- a/OpenCL/m12600_a3-optimized.cl +++ b/OpenCL/m12600_a3-optimized.cl @@ -42,14 +42,14 @@ DECLSPEC void m12600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * loop @@ -57,7 +57,7 @@ DECLSPEC void m12600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -333,14 +333,14 @@ DECLSPEC void m12600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * digest @@ -348,10 +348,10 @@ DECLSPEC void m12600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -360,7 +360,7 @@ DECLSPEC void m12600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -651,7 +651,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -691,7 +691,7 @@ KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) * main */ - m12600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m12600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m12600_m08 (KERN_ATTR_BASIC ()) @@ -721,7 +721,7 @@ KERNEL_FQ void m12600_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -761,7 +761,7 @@ KERNEL_FQ void m12600_m08 (KERN_ATTR_BASIC ()) * main */ - m12600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m12600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m12600_m16 (KERN_ATTR_BASIC ()) @@ -791,7 +791,7 @@ KERNEL_FQ void m12600_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -831,7 +831,7 @@ KERNEL_FQ void m12600_m16 (KERN_ATTR_BASIC ()) * main */ - m12600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m12600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) @@ -861,7 +861,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -901,7 +901,7 @@ KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) * main */ - m12600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m12600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m12600_s08 (KERN_ATTR_BASIC ()) @@ -931,7 +931,7 @@ KERNEL_FQ void m12600_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -971,7 +971,7 @@ KERNEL_FQ void m12600_s08 (KERN_ATTR_BASIC ()) * main */ - m12600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m12600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m12600_s16 (KERN_ATTR_BASIC ()) @@ -1001,7 +1001,7 @@ KERNEL_FQ void m12600_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1041,5 +1041,5 @@ KERNEL_FQ void m12600_s16 (KERN_ATTR_BASIC ()) * main */ - m12600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m12600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m12600_a3-pure.cl b/OpenCL/m12600_a3-pure.cl index b3fc1c8a4..fa6b4fbb7 100644 --- a/OpenCL/m12600_a3-pure.cl +++ b/OpenCL/m12600_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -62,14 +62,14 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_VECTOR ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * base @@ -90,7 +90,7 @@ KERNEL_FQ void m12600_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -201,7 +201,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -209,10 +209,10 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -221,14 +221,14 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_VECTOR ()) u32 pc256[8]; - pc256[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - pc256[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - pc256[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - pc256[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - pc256[4] = salt_bufs[SALT_POS].salt_buf_pc[4]; - pc256[5] = salt_bufs[SALT_POS].salt_buf_pc[5]; - pc256[6] = salt_bufs[SALT_POS].salt_buf_pc[6]; - pc256[7] = salt_bufs[SALT_POS].salt_buf_pc[7]; + pc256[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + pc256[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + pc256[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + pc256[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + pc256[4] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + pc256[5] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + pc256[6] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + pc256[7] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; /** * base @@ -249,7 +249,7 @@ KERNEL_FQ void m12600_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m12700-pure.cl b/OpenCL/m12700-pure.cl index 77a6bacd1..8dd14019f 100644 --- a/OpenCL/m12700-pure.cl +++ b/OpenCL/m12700-pure.cl @@ -86,7 +86,7 @@ KERNEL_FQ void m12700_init (KERN_ATTR_TMPS (mywallet_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -109,10 +109,10 @@ KERNEL_FQ void m12700_init (KERN_ATTR_TMPS (mywallet_tmp_t)) u32 w2[4]; u32 w3[4]; - w0[0] = salt_bufs[SALT_POS].salt_buf[0]; - w0[1] = salt_bufs[SALT_POS].salt_buf[1]; - w0[2] = salt_bufs[SALT_POS].salt_buf[2]; - w0[3] = salt_bufs[SALT_POS].salt_buf[3]; + w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + w0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + w0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + w0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; w1[0] = 0; w1[1] = 0; w1[2] = 0; @@ -171,7 +171,7 @@ KERNEL_FQ void m12700_loop (KERN_ATTR_TMPS (mywallet_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -205,7 +205,7 @@ KERNEL_FQ void m12700_loop (KERN_ATTR_TMPS (mywallet_tmp_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -309,7 +309,7 @@ KERNEL_FQ void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * AES part @@ -334,10 +334,10 @@ KERNEL_FQ void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) u32 iv[4]; - iv[0] = salt_bufs[SALT_POS].salt_buf[0]; - iv[1] = salt_bufs[SALT_POS].salt_buf[1]; - iv[2] = salt_bufs[SALT_POS].salt_buf[2]; - iv[3] = salt_bufs[SALT_POS].salt_buf[3]; + iv[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + iv[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + iv[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + iv[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; // decrypted data should be a JSON string consisting only of ASCII chars (0x09-0x7e) @@ -345,10 +345,10 @@ KERNEL_FQ void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) { u32 data[4]; - data[0] = salt_bufs[SALT_POS].salt_buf[i + 0]; - data[1] = salt_bufs[SALT_POS].salt_buf[i + 1]; - data[2] = salt_bufs[SALT_POS].salt_buf[i + 2]; - data[3] = salt_bufs[SALT_POS].salt_buf[i + 3]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[i + 0]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[i + 1]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[i + 2]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[i + 3]; u32 out[4]; @@ -370,10 +370,10 @@ KERNEL_FQ void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) iv[3] = data[3]; } - const u32 r0 = salt_bufs[SALT_POS].salt_buf[4]; - const u32 r1 = salt_bufs[SALT_POS].salt_buf[5]; - const u32 r2 = salt_bufs[SALT_POS].salt_buf[6]; - const u32 r3 = salt_bufs[SALT_POS].salt_buf[7]; + const u32 r0 = salt_bufs[SALT_POS_HOST].salt_buf[4]; + const u32 r1 = salt_bufs[SALT_POS_HOST].salt_buf[5]; + const u32 r2 = salt_bufs[SALT_POS_HOST].salt_buf[6]; + const u32 r3 = salt_bufs[SALT_POS_HOST].salt_buf[7]; #define il_pos 0 diff --git a/OpenCL/m12800-pure.cl b/OpenCL/m12800-pure.cl index 8bc4c9554..30658368c 100644 --- a/OpenCL/m12800-pure.cl +++ b/OpenCL/m12800-pure.cl @@ -103,7 +103,7 @@ KERNEL_FQ void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * generate nthash @@ -197,7 +197,7 @@ KERNEL_FQ void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -248,7 +248,7 @@ KERNEL_FQ void m12800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -294,7 +294,7 @@ KERNEL_FQ void m12800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -358,7 +358,7 @@ KERNEL_FQ void m12800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m12900-pure.cl b/OpenCL/m12900-pure.cl index 95f4e7085..dec25c8cf 100644 --- a/OpenCL/m12900-pure.cl +++ b/OpenCL/m12900-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m12900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -112,10 +112,10 @@ KERNEL_FQ void m12900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh u32 w2[4]; u32 w3[4]; - w0[0] = salt_bufs[SALT_POS].salt_buf[0]; - w0[1] = salt_bufs[SALT_POS].salt_buf[1]; - w0[2] = salt_bufs[SALT_POS].salt_buf[2]; - w0[3] = salt_bufs[SALT_POS].salt_buf[3]; + w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + w0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + w0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + w0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; w1[0] = 0; w1[1] = 0; w1[2] = 0; @@ -180,7 +180,7 @@ KERNEL_FQ void m12900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -226,7 +226,7 @@ KERNEL_FQ void m12900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -290,7 +290,7 @@ KERNEL_FQ void m12900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -320,14 +320,14 @@ KERNEL_FQ void m12900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh sha256_hmac_init_64 (&ctx, w0, w1, w2, w3); - w0[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - w0[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - w0[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - w0[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - w1[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - w1[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - w1[2] = salt_bufs[SALT_POS].salt_buf[10]; - w1[3] = salt_bufs[SALT_POS].salt_buf[11]; + w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + w0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + w0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + w0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + w1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + w1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + w1[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + w1[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; w2[0] = 0; w2[1] = 0; w2[2] = 0; diff --git a/OpenCL/m13000-pure.cl b/OpenCL/m13000-pure.cl index 578f67d47..1e60d9afc 100644 --- a/OpenCL/m13000-pure.cl +++ b/OpenCL/m13000-pure.cl @@ -77,7 +77,7 @@ KERNEL_FQ void m13000_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -101,7 +101,7 @@ KERNEL_FQ void m13000_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global (&sha256_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global (&sha256_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -157,7 +157,7 @@ KERNEL_FQ void m13000_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -203,7 +203,7 @@ KERNEL_FQ void m13000_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -267,7 +267,7 @@ KERNEL_FQ void m13000_comp (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl index 61fe57484..f4887f827 100644 --- a/OpenCL/m13100_a0-optimized.cl +++ b/OpenCL/m13100_a0-optimized.cl @@ -462,7 +462,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -496,16 +496,16 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -531,11 +531,11 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -558,7 +558,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -592,16 +592,16 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -627,11 +627,11 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m13100_a0-pure.cl b/OpenCL/m13100_a0-pure.cl index 70462fd99..9b2de8a22 100644 --- a/OpenCL/m13100_a0-pure.cl +++ b/OpenCL/m13100_a0-pure.cl @@ -274,7 +274,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -286,16 +286,16 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -315,11 +315,11 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -334,7 +334,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -346,16 +346,16 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -375,11 +375,11 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m13100_a1-optimized.cl b/OpenCL/m13100_a1-optimized.cl index 5c103b1f0..7bb72c3e0 100644 --- a/OpenCL/m13100_a1-optimized.cl +++ b/OpenCL/m13100_a1-optimized.cl @@ -465,7 +465,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -493,16 +493,16 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -540,7 +540,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -578,11 +578,11 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -610,7 +610,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -638,16 +638,16 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -685,7 +685,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -723,11 +723,11 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m13100_a1-pure.cl b/OpenCL/m13100_a1-pure.cl index 7ae0386dd..d459fc36d 100644 --- a/OpenCL/m13100_a1-pure.cl +++ b/OpenCL/m13100_a1-pure.cl @@ -272,7 +272,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -282,10 +282,10 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; md4_ctx_t ctx0; @@ -297,7 +297,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -311,11 +311,11 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -330,7 +330,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -340,10 +340,10 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; md4_ctx_t ctx0; @@ -355,7 +355,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -369,11 +369,11 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m13100_a3-optimized.cl b/OpenCL/m13100_a3-optimized.cl index c93673d7e..50886dc36 100644 --- a/OpenCL/m13100_a3-optimized.cl +++ b/OpenCL/m13100_a3-optimized.cl @@ -466,10 +466,10 @@ DECLSPEC void m13100 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop @@ -477,7 +477,7 @@ DECLSPEC void m13100 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 w0l = w0[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 w0r = bfs_buf[il_pos].i; @@ -500,11 +500,11 @@ DECLSPEC void m13100 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -519,7 +519,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -557,7 +557,7 @@ KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) @@ -569,7 +569,7 @@ KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -607,7 +607,7 @@ KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13100_m16 (KERN_ATTR_ESALT (krb5tgs_t)) @@ -623,7 +623,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -661,7 +661,7 @@ KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) @@ -673,7 +673,7 @@ KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -711,7 +711,7 @@ KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13100 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13100_s16 (KERN_ATTR_ESALT (krb5tgs_t)) diff --git a/OpenCL/m13100_a3-pure.cl b/OpenCL/m13100_a3-pure.cl index e6230b386..00950c885 100644 --- a/OpenCL/m13100_a3-pure.cl +++ b/OpenCL/m13100_a3-pure.cl @@ -272,7 +272,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -291,10 +291,10 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop @@ -302,7 +302,7 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -324,11 +324,11 @@ KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -343,7 +343,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -362,10 +362,10 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop @@ -373,7 +373,7 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -395,11 +395,11 @@ KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m13200-pure.cl b/OpenCL/m13200-pure.cl index 9fdf908d0..93e3eb209 100644 --- a/OpenCL/m13200-pure.cl +++ b/OpenCL/m13200-pure.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * KEK @@ -51,10 +51,10 @@ KERNEL_FQ void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t)) KEK[4] = ctx.h[4]; /* hash XOR salt is KEK, used as key for AES wrapping routine */ - tmps[gid].KEK[0] = KEK[0] ^ salt_bufs[SALT_POS].salt_buf[0]; - tmps[gid].KEK[1] = KEK[1] ^ salt_bufs[SALT_POS].salt_buf[1]; - tmps[gid].KEK[2] = KEK[2] ^ salt_bufs[SALT_POS].salt_buf[2]; - tmps[gid].KEK[3] = KEK[3] ^ salt_bufs[SALT_POS].salt_buf[3]; + tmps[gid].KEK[0] = KEK[0] ^ salt_bufs[SALT_POS_HOST].salt_buf[0]; + tmps[gid].KEK[1] = KEK[1] ^ salt_bufs[SALT_POS_HOST].salt_buf[1]; + tmps[gid].KEK[2] = KEK[2] ^ salt_bufs[SALT_POS_HOST].salt_buf[2]; + tmps[gid].KEK[3] = KEK[3] ^ salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * salt_buf[0..3] is salt @@ -62,14 +62,14 @@ KERNEL_FQ void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t)) */ /* set lsb */ - tmps[gid].lsb[0] = salt_bufs[SALT_POS].salt_buf[6]; - tmps[gid].lsb[1] = salt_bufs[SALT_POS].salt_buf[7]; - tmps[gid].lsb[2] = salt_bufs[SALT_POS].salt_buf[8]; - tmps[gid].lsb[3] = salt_bufs[SALT_POS].salt_buf[9]; + tmps[gid].lsb[0] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + tmps[gid].lsb[1] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + tmps[gid].lsb[2] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + tmps[gid].lsb[3] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /* set msb */ - tmps[gid].cipher[0] = salt_bufs[SALT_POS].salt_buf[4]; - tmps[gid].cipher[1] = salt_bufs[SALT_POS].salt_buf[5]; + tmps[gid].cipher[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + tmps[gid].cipher[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; tmps[gid].cipher[2] = 0; tmps[gid].cipher[3] = 0; } @@ -131,7 +131,7 @@ KERNEL_FQ void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[4]; @@ -168,10 +168,10 @@ KERNEL_FQ void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) AES128_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - const u32 wrapping_rounds = salt_bufs[SALT_POS].salt_iter - 1; + const u32 wrapping_rounds = salt_bufs[SALT_POS_HOST].salt_iter - 1; /* custom AES un-wrapping loop */ - for (u32 i = 0, j = wrapping_rounds - loop_pos; i < loop_cnt; i++, j--) + for (u32 i = 0, j = wrapping_rounds - LOOP_POS; i < LOOP_CNT; i++, j--) { const u32 j2 = j * 2; @@ -219,7 +219,7 @@ KERNEL_FQ void m13200_comp (KERN_ATTR_TMPS (axcrypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -227,9 +227,9 @@ KERNEL_FQ void m13200_comp (KERN_ATTR_TMPS (axcrypt_tmp_t)) if (tmps[gid].cipher[0] == 0xa6a6a6a6 && tmps[gid].cipher[1] == 0xa6a6a6a6) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m13300_a0-optimized.cl b/OpenCL/m13300_a0-optimized.cl index a77534064..1689368b0 100644 --- a/OpenCL/m13300_a0-optimized.cl +++ b/OpenCL/m13300_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -217,7 +217,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -239,17 +239,17 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m13300_a0-pure.cl b/OpenCL/m13300_a0-pure.cl index 9946bcfe7..676adc73e 100644 --- a/OpenCL/m13300_a0-pure.cl +++ b/OpenCL/m13300_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -71,7 +71,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -79,10 +79,10 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -95,7 +95,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m13300_a1-optimized.cl b/OpenCL/m13300_a1-optimized.cl index a664357f4..073d50649 100644 --- a/OpenCL/m13300_a1-optimized.cl +++ b/OpenCL/m13300_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -48,7 +48,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -86,7 +86,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -273,7 +273,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -295,17 +295,17 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -343,7 +343,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m13300_a1-pure.cl b/OpenCL/m13300_a1-pure.cl index 3c6101371..b15e4355d 100644 --- a/OpenCL/m13300_a1-pure.cl +++ b/OpenCL/m13300_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -67,7 +67,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -95,7 +95,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m13300_a3-optimized.cl b/OpenCL/m13300_a3-optimized.cl index 87d6fcd83..619d436eb 100644 --- a/OpenCL/m13300_a3-optimized.cl +++ b/OpenCL/m13300_a3-optimized.cl @@ -110,7 +110,7 @@ DECLSPEC void m13300m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -361,10 +361,10 @@ DECLSPEC void m13300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -373,7 +373,7 @@ DECLSPEC void m13300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -536,7 +536,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -563,7 +563,7 @@ KERNEL_FQ void m13300_m04 (KERN_ATTR_VECTOR ()) * main */ - m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13300_m08 (KERN_ATTR_VECTOR ()) @@ -574,7 +574,7 @@ KERNEL_FQ void m13300_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -601,7 +601,7 @@ KERNEL_FQ void m13300_m08 (KERN_ATTR_VECTOR ()) * main */ - m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13300_m16 (KERN_ATTR_VECTOR ()) @@ -612,7 +612,7 @@ KERNEL_FQ void m13300_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -639,7 +639,7 @@ KERNEL_FQ void m13300_m16 (KERN_ATTR_VECTOR ()) * main */ - m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13300_s04 (KERN_ATTR_VECTOR ()) @@ -650,7 +650,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -677,7 +677,7 @@ KERNEL_FQ void m13300_s04 (KERN_ATTR_VECTOR ()) * main */ - m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13300_s08 (KERN_ATTR_VECTOR ()) @@ -688,7 +688,7 @@ KERNEL_FQ void m13300_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -715,7 +715,7 @@ KERNEL_FQ void m13300_s08 (KERN_ATTR_VECTOR ()) * main */ - m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13300_s16 (KERN_ATTR_VECTOR ()) @@ -726,7 +726,7 @@ KERNEL_FQ void m13300_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -753,5 +753,5 @@ KERNEL_FQ void m13300_s16 (KERN_ATTR_VECTOR ()) * main */ - m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m13300_a3-pure.cl b/OpenCL/m13300_a3-pure.cl index 8ee4224a2..fd11b271a 100644 --- a/OpenCL/m13300_a3-pure.cl +++ b/OpenCL/m13300_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m13300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -80,7 +80,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -113,7 +113,7 @@ KERNEL_FQ void m13300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m13400-pure.cl b/OpenCL/m13400-pure.cl index 55ca2856d..38e12ba3e 100644 --- a/OpenCL/m13400-pure.cl +++ b/OpenCL/m13400-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t ctx; @@ -74,7 +74,7 @@ KERNEL_FQ void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) digest[6] = ctx.h[6]; digest[7] = ctx.h[7]; - if (esalt_bufs[DIGESTS_OFFSET].version == 2 && esalt_bufs[DIGESTS_OFFSET].keyfile_len == 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].version == 2 && esalt_bufs[DIGESTS_OFFSET_HOST].keyfile_len == 0) { u32 w0[4]; u32 w1[4]; @@ -114,7 +114,7 @@ KERNEL_FQ void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) digest[7] = ctx.h[7]; } - if (esalt_bufs[DIGESTS_OFFSET].keyfile_len != 0) + if (esalt_bufs[DIGESTS_OFFSET_HOST].keyfile_len != 0) { u32 w0[4]; u32 w1[4]; @@ -129,14 +129,14 @@ KERNEL_FQ void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) w1[1] = digest[5]; w1[2] = digest[6]; w1[3] = digest[7]; - w2[0] = esalt_bufs[DIGESTS_OFFSET].keyfile[0]; - w2[1] = esalt_bufs[DIGESTS_OFFSET].keyfile[1]; - w2[2] = esalt_bufs[DIGESTS_OFFSET].keyfile[2]; - w2[3] = esalt_bufs[DIGESTS_OFFSET].keyfile[3]; - w3[0] = esalt_bufs[DIGESTS_OFFSET].keyfile[4]; - w3[1] = esalt_bufs[DIGESTS_OFFSET].keyfile[5]; - w3[2] = esalt_bufs[DIGESTS_OFFSET].keyfile[6]; - w3[3] = esalt_bufs[DIGESTS_OFFSET].keyfile[7]; + w2[0] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[0]; + w2[1] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[1]; + w2[2] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[2]; + w2[3] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[3]; + w3[0] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[4]; + w3[1] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[5]; + w3[2] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[6]; + w3[3] = esalt_bufs[DIGESTS_OFFSET_HOST].keyfile[7]; sha256_init (&ctx); @@ -203,20 +203,20 @@ KERNEL_FQ void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* Construct AES key */ u32 ukey[8]; - ukey[0] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[0]; - ukey[1] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[1]; - ukey[2] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[2]; - ukey[3] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[3]; - ukey[4] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[4]; - ukey[5] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[5]; - ukey[6] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[6]; - ukey[7] = esalt_bufs[DIGESTS_OFFSET].transf_random_seed[7]; + ukey[0] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[0]; + ukey[1] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[1]; + ukey[2] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[2]; + ukey[3] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[3]; + ukey[4] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[4]; + ukey[5] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[5]; + ukey[6] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[6]; + ukey[7] = esalt_bufs[DIGESTS_OFFSET_HOST].transf_random_seed[7]; #define KEYLEN 60 @@ -236,7 +236,7 @@ KERNEL_FQ void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) data1[2] = tmps[gid].tmp_digest[6]; data1[3] = tmps[gid].tmp_digest[7]; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { AES256_encrypt (ks, data0, data0, s_te0, s_te1, s_te2, s_te3, s_te4); AES256_encrypt (ks, data1, data1, s_te0, s_te1, s_te2, s_te3, s_te4); @@ -309,7 +309,7 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* hash output... */ @@ -356,12 +356,12 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) /* ...then hash final_random_seed | output */ - if (esalt_bufs[DIGESTS_OFFSET].version == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].version == 1) { - w0[0] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[0]; - w0[1] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[1]; - w0[2] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[2]; - w0[3] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[3]; + w0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[0]; + w0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[1]; + w0[2] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[2]; + w0[3] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[3]; w1[0] = digest[0]; w1[1] = digest[1]; w1[2] = digest[2]; @@ -392,14 +392,14 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) } else { - w0[0] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[0]; - w0[1] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[1]; - w0[2] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[2]; - w0[3] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[3]; - w1[0] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[4]; - w1[1] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[5]; - w1[2] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[6]; - w1[3] = esalt_bufs[DIGESTS_OFFSET].final_random_seed[7]; + w0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[0]; + w0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[1]; + w0[2] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[2]; + w0[3] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[3]; + w1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[4]; + w1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[5]; + w1[2] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[6]; + w1[3] = esalt_bufs[DIGESTS_OFFSET_HOST].final_random_seed[7]; w2[0] = digest[0]; w2[1] = digest[1]; w2[2] = digest[2]; @@ -429,23 +429,23 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].enc_iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].enc_iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].enc_iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].enc_iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_iv[3]; u32 r0 = 0; u32 r1 = 0; u32 r2 = 0; u32 r3 = 0; - if (esalt_bufs[DIGESTS_OFFSET].version == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].version == 1) { sha256_ctx_t ctx; sha256_init (&ctx); - if (esalt_bufs[DIGESTS_OFFSET].algorithm == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].algorithm == 1) { /* Construct final Twofish key */ u32 sk[4]; @@ -467,7 +467,7 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) iv[2] = hc_swap32_S (iv[2]); iv[3] = hc_swap32_S (iv[3]); - u32 contents_len = esalt_bufs[DIGESTS_OFFSET].contents_len; + u32 contents_len = esalt_bufs[DIGESTS_OFFSET_HOST].contents_len; u32 contents_pos; u32 contents_off; @@ -478,10 +478,10 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 3]; data[0] = hc_swap32_S (data[0]); data[1] = hc_swap32_S (data[1]); @@ -524,10 +524,10 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 3]; data[0] = hc_swap32_S (data[0]); data[1] = hc_swap32_S (data[1]); @@ -578,7 +578,7 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) AES256_set_decrypt_key (ks, digest, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - u32 contents_len = esalt_bufs[DIGESTS_OFFSET].contents_len; + u32 contents_len = esalt_bufs[DIGESTS_OFFSET_HOST].contents_len; u32 contents_pos; u32 contents_off; @@ -587,10 +587,10 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 3]; u32 out[4]; @@ -623,10 +623,10 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].contents[contents_off + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[contents_off + 3]; u32 out[4]; @@ -677,10 +677,10 @@ KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].contents_hash[0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].contents_hash[1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].contents_hash[2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].contents_hash[3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents_hash[0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents_hash[1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents_hash[2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents_hash[3]; u32 out[4]; diff --git a/OpenCL/m13500_a0-optimized.cl b/OpenCL/m13500_a0-optimized.cl index 4c9967028..bfc8f8e7e 100644 --- a/OpenCL/m13500_a0-optimized.cl +++ b/OpenCL/m13500_a0-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,47 +61,47 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t)) * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; const u32 pc_offset4 = pc_offset * 4; u32 pc_digest[5]; - pc_digest[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - pc_digest[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - pc_digest[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - pc_digest[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - pc_digest[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; + pc_digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + pc_digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + pc_digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + pc_digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + pc_digest[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; u32 salt_buf0[4]; u32 salt_buf1[4]; u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - const u32 salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -466,7 +466,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -486,41 +486,41 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; const u32 pc_offset4 = pc_offset * 4; u32 pc_digest[5]; - pc_digest[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - pc_digest[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - pc_digest[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - pc_digest[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - pc_digest[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; + pc_digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + pc_digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + pc_digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + pc_digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + pc_digest[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; u32 salt_buf0[4]; u32 salt_buf1[4]; u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - const u32 salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * digest @@ -528,17 +528,17 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m13500_a0-pure.cl b/OpenCL/m13500_a0-pure.cl index e58051aaa..4497cc52e 100644 --- a/OpenCL/m13500_a0-pure.cl +++ b/OpenCL/m13500_a0-pure.cl @@ -35,40 +35,40 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_RULES_ESALT (pstoken_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; sha1_ctx_t ctx0; - ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; - - ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - ctx0.len = esalt_bufs[DIGESTS_OFFSET].salt_len; + ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; + + ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + ctx0.len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * base @@ -80,7 +80,7 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_RULES_ESALT (pstoken_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -110,7 +110,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_RULES_ESALT (pstoken_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -118,44 +118,44 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_RULES_ESALT (pstoken_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; sha1_ctx_t ctx0; - ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; - - ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - ctx0.len = esalt_bufs[DIGESTS_OFFSET].salt_len; + ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; + + ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + ctx0.len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * base @@ -167,7 +167,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_RULES_ESALT (pstoken_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m13500_a1-optimized.cl b/OpenCL/m13500_a1-optimized.cl index 0f6002f55..b607f0677 100644 --- a/OpenCL/m13500_a1-optimized.cl +++ b/OpenCL/m13500_a1-optimized.cl @@ -39,7 +39,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -59,47 +59,47 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; const u32 pc_offset4 = pc_offset * 4; u32 pc_digest[5]; - pc_digest[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - pc_digest[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - pc_digest[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - pc_digest[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - pc_digest[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; + pc_digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + pc_digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + pc_digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + pc_digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + pc_digest[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; u32 salt_buf0[4]; u32 salt_buf1[4]; u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - const u32 salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -137,7 +137,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -516,7 +516,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -536,41 +536,41 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; const u32 pc_offset4 = pc_offset * 4; u32 pc_digest[5]; - pc_digest[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - pc_digest[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - pc_digest[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - pc_digest[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - pc_digest[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; + pc_digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + pc_digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + pc_digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + pc_digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + pc_digest[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; u32 salt_buf0[4]; u32 salt_buf1[4]; u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - const u32 salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * digest @@ -578,17 +578,17 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -626,7 +626,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m13500_a1-pure.cl b/OpenCL/m13500_a1-pure.cl index 88e647f8a..fafdbf752 100644 --- a/OpenCL/m13500_a1-pure.cl +++ b/OpenCL/m13500_a1-pure.cl @@ -33,40 +33,40 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_ESALT (pstoken_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; sha1_ctx_t ctx0; - ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; - - ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - ctx0.len = esalt_bufs[DIGESTS_OFFSET].salt_len; + ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; + + ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + ctx0.len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * base @@ -78,7 +78,7 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_ESALT (pstoken_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -104,7 +104,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_ESALT (pstoken_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -112,44 +112,44 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_ESALT (pstoken_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; sha1_ctx_t ctx0; - ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; - - ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - ctx0.len = esalt_bufs[DIGESTS_OFFSET].salt_len; + ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; + + ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + ctx0.len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * base @@ -161,7 +161,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_ESALT (pstoken_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m13500_a3-optimized.cl b/OpenCL/m13500_a3-optimized.cl index ae2bc1d9a..9e88f983f 100644 --- a/OpenCL/m13500_a3-optimized.cl +++ b/OpenCL/m13500_a3-optimized.cl @@ -38,41 +38,41 @@ DECLSPEC void m13500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; const u32 pc_offset4 = pc_offset * 4; u32 pc_digest[5]; - pc_digest[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - pc_digest[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - pc_digest[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - pc_digest[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - pc_digest[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; + pc_digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + pc_digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + pc_digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + pc_digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + pc_digest[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; u32 salt_buf0[4]; u32 salt_buf1[4]; u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - const u32 salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -82,7 +82,7 @@ DECLSPEC void m13500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -431,41 +431,41 @@ DECLSPEC void m13500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; const u32 pc_offset4 = pc_offset * 4; u32 pc_digest[5]; - pc_digest[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - pc_digest[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - pc_digest[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - pc_digest[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - pc_digest[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; + pc_digest[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + pc_digest[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + pc_digest[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + pc_digest[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + pc_digest[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; u32 salt_buf0[4]; u32 salt_buf1[4]; u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - const u32 salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + salt_buf0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + salt_buf0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + salt_buf0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + salt_buf0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + salt_buf1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + salt_buf1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + salt_buf1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + salt_buf1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + salt_buf2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + salt_buf2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + salt_buf2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + salt_buf2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + salt_buf3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + salt_buf3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + salt_buf3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + salt_buf3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -475,10 +475,10 @@ DECLSPEC void m13500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -487,7 +487,7 @@ DECLSPEC void m13500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -831,7 +831,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -867,7 +867,7 @@ KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) * main */ - m13500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) @@ -878,7 +878,7 @@ KERNEL_FQ void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -914,7 +914,7 @@ KERNEL_FQ void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) * main */ - m13500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) @@ -925,7 +925,7 @@ KERNEL_FQ void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -961,7 +961,7 @@ KERNEL_FQ void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) * main */ - m13500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) @@ -972,7 +972,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1008,7 +1008,7 @@ KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) * main */ - m13500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) @@ -1019,7 +1019,7 @@ KERNEL_FQ void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1055,7 +1055,7 @@ KERNEL_FQ void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) * main */ - m13500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) @@ -1066,7 +1066,7 @@ KERNEL_FQ void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -1102,5 +1102,5 @@ KERNEL_FQ void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) * main */ - m13500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m13500_a3-pure.cl b/OpenCL/m13500_a3-pure.cl index d396318f8..3213f874c 100644 --- a/OpenCL/m13500_a3-pure.cl +++ b/OpenCL/m13500_a3-pure.cl @@ -33,40 +33,40 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; sha1_ctx_t ctx0; - ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; - - ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - ctx0.len = esalt_bufs[DIGESTS_OFFSET].salt_len; + ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; + + ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + ctx0.len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * base @@ -87,7 +87,7 @@ KERNEL_FQ void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -121,7 +121,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -129,44 +129,44 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET].pc_offset; + const u32 pc_offset = esalt_bufs[DIGESTS_OFFSET_HOST].pc_offset; sha1_ctx_t ctx0; - ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET].pc_digest[0]; - ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET].pc_digest[1]; - ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET].pc_digest[2]; - ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET].pc_digest[3]; - ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET].pc_digest[4]; - - ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 0]); - ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 1]); - ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 2]); - ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 3]); - ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 4]); - ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 5]); - ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 6]); - ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 7]); - ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 8]); - ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 9]); - ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 10]); - ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 11]); - ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 12]); - ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 13]); - ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 14]); - ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[pc_offset + 15]); - - ctx0.len = esalt_bufs[DIGESTS_OFFSET].salt_len; + ctx0.h[0] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[0]; + ctx0.h[1] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[1]; + ctx0.h[2] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[2]; + ctx0.h[3] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[3]; + ctx0.h[4] = esalt_bufs[DIGESTS_OFFSET_HOST].pc_digest[4]; + + ctx0.w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 0]); + ctx0.w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 1]); + ctx0.w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 2]); + ctx0.w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 3]); + ctx0.w1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 4]); + ctx0.w1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 5]); + ctx0.w1[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 6]); + ctx0.w1[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 7]); + ctx0.w2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 8]); + ctx0.w2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 9]); + ctx0.w2[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 10]); + ctx0.w2[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 11]); + ctx0.w3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 12]); + ctx0.w3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 13]); + ctx0.w3[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 14]); + ctx0.w3[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[pc_offset + 15]); + + ctx0.len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; /** * base @@ -187,7 +187,7 @@ KERNEL_FQ void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m13600-pure.cl b/OpenCL/m13600-pure.cl index 34356b3a9..184d1a5f9 100644 --- a/OpenCL/m13600-pure.cl +++ b/OpenCL/m13600-pure.cl @@ -87,7 +87,7 @@ KERNEL_FQ void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -110,10 +110,10 @@ KERNEL_FQ void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) u32 w2[4]; u32 w3[4]; - w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[0]); - w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[1]); - w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[2]); - w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt_buf[3]); + w0[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[0]); + w0[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[1]); + w0[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[2]); + w0[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[3]); w1[0] = 0; w1[1] = 0; w1[2] = 0; @@ -127,9 +127,9 @@ KERNEL_FQ void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) w3[2] = 0; w3[3] = 0; - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); - const u32 mode = esalt_bufs[DIGESTS_OFFSET].mode; + const u32 mode = esalt_bufs[DIGESTS_OFFSET_HOST].mode; int iter_start; int iter_stop; @@ -192,7 +192,7 @@ KERNEL_FQ void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -209,9 +209,9 @@ KERNEL_FQ void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) opad[3] = packv (tmps, opad, gid, 3); opad[4] = packv (tmps, opad, gid, 4); - const u32 verify_bytes = esalt_bufs[DIGESTS_OFFSET].verify_bytes; + const u32 verify_bytes = esalt_bufs[DIGESTS_OFFSET_HOST].verify_bytes; - const u32 mode = esalt_bufs[DIGESTS_OFFSET].mode; + const u32 mode = esalt_bufs[DIGESTS_OFFSET_HOST].mode; int iter_start; int iter_stop; @@ -248,7 +248,7 @@ KERNEL_FQ void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) out[3] = packv (tmps, out, gid, i5 + 3); out[4] = packv (tmps, out, gid, i5 + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -310,11 +310,11 @@ KERNEL_FQ void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); - const u32 mode = esalt_bufs[DIGESTS_OFFSET].mode; + const u32 mode = esalt_bufs[DIGESTS_OFFSET_HOST].mode; u32 iter_start; u32 iter_stop; @@ -365,7 +365,7 @@ KERNEL_FQ void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].data_buf, esalt_bufs[DIGESTS_OFFSET].data_len); + sha1_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].data_buf, esalt_bufs[DIGESTS_OFFSET_HOST].data_len); sha1_hmac_final (&ctx); diff --git a/OpenCL/m13711-pure.cl b/OpenCL/m13711-pure.cl index b8f62904f..6b0bfaf97 100644 --- a/OpenCL/m13711-pure.cl +++ b/OpenCL/m13711-pure.cl @@ -135,18 +135,18 @@ KERNEL_FQ void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -191,7 +191,7 @@ KERNEL_FQ void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -209,7 +209,7 @@ KERNEL_FQ void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 5, j += 1) { @@ -259,23 +259,23 @@ KERNEL_FQ void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -324,7 +324,7 @@ KERNEL_FQ void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -443,7 +443,7 @@ KERNEL_FQ void m13711_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -515,13 +515,13 @@ KERNEL_FQ void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -530,7 +530,7 @@ KERNEL_FQ void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13712-pure.cl b/OpenCL/m13712-pure.cl index c00d2144f..6d80df323 100644 --- a/OpenCL/m13712-pure.cl +++ b/OpenCL/m13712-pure.cl @@ -186,18 +186,18 @@ KERNEL_FQ void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -242,7 +242,7 @@ KERNEL_FQ void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -260,7 +260,7 @@ KERNEL_FQ void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 32; i += 5, j += 1) { @@ -310,23 +310,23 @@ KERNEL_FQ void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -375,7 +375,7 @@ KERNEL_FQ void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -494,7 +494,7 @@ KERNEL_FQ void m13712_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -571,13 +571,13 @@ KERNEL_FQ void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -586,7 +586,7 @@ KERNEL_FQ void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -594,7 +594,7 @@ KERNEL_FQ void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13713-pure.cl b/OpenCL/m13713-pure.cl index ffd193ff8..d4bdbdef4 100644 --- a/OpenCL/m13713-pure.cl +++ b/OpenCL/m13713-pure.cl @@ -251,18 +251,18 @@ KERNEL_FQ void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -307,7 +307,7 @@ KERNEL_FQ void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -325,7 +325,7 @@ KERNEL_FQ void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 48; i += 5, j += 1) { @@ -375,23 +375,23 @@ KERNEL_FQ void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -440,7 +440,7 @@ KERNEL_FQ void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -559,7 +559,7 @@ KERNEL_FQ void m13713_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -641,13 +641,13 @@ KERNEL_FQ void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -656,7 +656,7 @@ KERNEL_FQ void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -664,7 +664,7 @@ KERNEL_FQ void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -672,7 +672,7 @@ KERNEL_FQ void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13721-pure.cl b/OpenCL/m13721-pure.cl index 743cd3f30..999f7bc35 100644 --- a/OpenCL/m13721-pure.cl +++ b/OpenCL/m13721-pure.cl @@ -157,18 +157,18 @@ KERNEL_FQ void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -213,7 +213,7 @@ KERNEL_FQ void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha512_hmac_ctx_t sha512_hmac_ctx; @@ -237,7 +237,7 @@ KERNEL_FQ void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -313,23 +313,23 @@ KERNEL_FQ void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -390,7 +390,7 @@ KERNEL_FQ void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -541,7 +541,7 @@ KERNEL_FQ void m13721_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -613,13 +613,13 @@ KERNEL_FQ void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -628,7 +628,7 @@ KERNEL_FQ void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13722-pure.cl b/OpenCL/m13722-pure.cl index 0425af528..671e06be1 100644 --- a/OpenCL/m13722-pure.cl +++ b/OpenCL/m13722-pure.cl @@ -208,18 +208,18 @@ KERNEL_FQ void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -264,7 +264,7 @@ KERNEL_FQ void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha512_hmac_ctx_t sha512_hmac_ctx; @@ -288,7 +288,7 @@ KERNEL_FQ void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 8, j += 1) { @@ -364,23 +364,23 @@ KERNEL_FQ void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -441,7 +441,7 @@ KERNEL_FQ void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -592,7 +592,7 @@ KERNEL_FQ void m13722_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -669,13 +669,13 @@ KERNEL_FQ void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -684,7 +684,7 @@ KERNEL_FQ void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -692,7 +692,7 @@ KERNEL_FQ void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13723-pure.cl b/OpenCL/m13723-pure.cl index 8d2c51293..821a7cc42 100644 --- a/OpenCL/m13723-pure.cl +++ b/OpenCL/m13723-pure.cl @@ -273,18 +273,18 @@ KERNEL_FQ void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -329,7 +329,7 @@ KERNEL_FQ void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha512_hmac_ctx_t sha512_hmac_ctx; @@ -353,7 +353,7 @@ KERNEL_FQ void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 24; i += 8, j += 1) { @@ -429,23 +429,23 @@ KERNEL_FQ void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -506,7 +506,7 @@ KERNEL_FQ void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -657,7 +657,7 @@ KERNEL_FQ void m13723_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -739,13 +739,13 @@ KERNEL_FQ void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -754,7 +754,7 @@ KERNEL_FQ void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -762,7 +762,7 @@ KERNEL_FQ void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -770,7 +770,7 @@ KERNEL_FQ void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13731-pure.cl b/OpenCL/m13731-pure.cl index d29bbe121..a0aaae4c9 100644 --- a/OpenCL/m13731-pure.cl +++ b/OpenCL/m13731-pure.cl @@ -195,13 +195,13 @@ KERNEL_FQ void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -248,7 +248,7 @@ KERNEL_FQ void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -293,7 +293,7 @@ KERNEL_FQ void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); whirlpool_hmac_ctx_t whirlpool_hmac_ctx; @@ -333,7 +333,7 @@ KERNEL_FQ void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[14] = whirlpool_hmac_ctx.opad.h[14]; tmps[gid].opad[15] = whirlpool_hmac_ctx.opad.h[15]; - whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 16, j += 1) { @@ -449,23 +449,23 @@ KERNEL_FQ void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -558,7 +558,7 @@ KERNEL_FQ void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[14] = packv (tmps, out, gid, i + 14); out[15] = packv (tmps, out, gid, i + 15); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -721,7 +721,7 @@ KERNEL_FQ void m13731_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -793,13 +793,13 @@ KERNEL_FQ void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -808,7 +808,7 @@ KERNEL_FQ void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13732-pure.cl b/OpenCL/m13732-pure.cl index 57e153479..7372b8465 100644 --- a/OpenCL/m13732-pure.cl +++ b/OpenCL/m13732-pure.cl @@ -246,13 +246,13 @@ KERNEL_FQ void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -299,7 +299,7 @@ KERNEL_FQ void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -344,7 +344,7 @@ KERNEL_FQ void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); whirlpool_hmac_ctx_t whirlpool_hmac_ctx; @@ -384,7 +384,7 @@ KERNEL_FQ void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[14] = whirlpool_hmac_ctx.opad.h[14]; tmps[gid].opad[15] = whirlpool_hmac_ctx.opad.h[15]; - whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 32; i += 16, j += 1) { @@ -500,23 +500,23 @@ KERNEL_FQ void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -609,7 +609,7 @@ KERNEL_FQ void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[14] = packv (tmps, out, gid, i + 14); out[15] = packv (tmps, out, gid, i + 15); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -772,7 +772,7 @@ KERNEL_FQ void m13732_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -849,13 +849,13 @@ KERNEL_FQ void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -864,7 +864,7 @@ KERNEL_FQ void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -872,7 +872,7 @@ KERNEL_FQ void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13733-pure.cl b/OpenCL/m13733-pure.cl index 82994a66a..7480ef646 100644 --- a/OpenCL/m13733-pure.cl +++ b/OpenCL/m13733-pure.cl @@ -311,13 +311,13 @@ KERNEL_FQ void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -364,7 +364,7 @@ KERNEL_FQ void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -409,7 +409,7 @@ KERNEL_FQ void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); whirlpool_hmac_ctx_t whirlpool_hmac_ctx; @@ -449,7 +449,7 @@ KERNEL_FQ void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[14] = whirlpool_hmac_ctx.opad.h[14]; tmps[gid].opad[15] = whirlpool_hmac_ctx.opad.h[15]; - whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + whirlpool_hmac_update_global_swap (&whirlpool_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 48; i += 16, j += 1) { @@ -565,23 +565,23 @@ KERNEL_FQ void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -674,7 +674,7 @@ KERNEL_FQ void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[14] = packv (tmps, out, gid, i + 14); out[15] = packv (tmps, out, gid, i + 15); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -837,7 +837,7 @@ KERNEL_FQ void m13733_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -919,13 +919,13 @@ KERNEL_FQ void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -934,7 +934,7 @@ KERNEL_FQ void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -942,7 +942,7 @@ KERNEL_FQ void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -950,7 +950,7 @@ KERNEL_FQ void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13751-pure.cl b/OpenCL/m13751-pure.cl index 9fc0f8d2a..6b0481ccc 100644 --- a/OpenCL/m13751-pure.cl +++ b/OpenCL/m13751-pure.cl @@ -141,18 +141,18 @@ KERNEL_FQ void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -197,7 +197,7 @@ KERNEL_FQ void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha256_hmac_ctx_t sha256_hmac_ctx; @@ -221,7 +221,7 @@ KERNEL_FQ void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 8, j += 1) { @@ -281,23 +281,23 @@ KERNEL_FQ void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -313,8 +313,8 @@ KERNEL_FQ void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } /* this feels harder to read than the loop variant - const int j_start = 1 + loop_pos + 0; - const int j_stop = 1 + loop_pos + loop_cnt; + const int j_start = 1 + LOOP_POS + 0; + const int j_stop = 1 + LOOP_POS + LOOP_CNT; const int pim_start = j_start / 1000; const int pim_stop = j_stop / 1000; @@ -323,14 +323,14 @@ KERNEL_FQ void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int pim_start1 = pim_start + 1; - if ((pim_start1 >= esalt_bufs[DIGESTS_OFFSET].pim_start) && (pim_start1 <= esalt_bufs[DIGESTS_OFFSET].pim_stop)) + if ((pim_start1 >= esalt_bufs[DIGESTS_OFFSET_HOST].pim_start) && (pim_start1 <= esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop)) { if (pim_start == pim_stop) { if (at_stop == 999) { pim = pim_start1; - pim_at = loop_cnt; + pim_at = LOOP_CNT; } } else @@ -387,7 +387,7 @@ KERNEL_FQ void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -518,7 +518,7 @@ KERNEL_FQ void m13751_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -590,13 +590,13 @@ KERNEL_FQ void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -605,7 +605,7 @@ KERNEL_FQ void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13752-pure.cl b/OpenCL/m13752-pure.cl index f5490bcc9..20179bac8 100644 --- a/OpenCL/m13752-pure.cl +++ b/OpenCL/m13752-pure.cl @@ -192,18 +192,18 @@ KERNEL_FQ void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -248,7 +248,7 @@ KERNEL_FQ void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha256_hmac_ctx_t sha256_hmac_ctx; @@ -272,7 +272,7 @@ KERNEL_FQ void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 32; i += 8, j += 1) { @@ -332,23 +332,23 @@ KERNEL_FQ void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -409,7 +409,7 @@ KERNEL_FQ void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -540,7 +540,7 @@ KERNEL_FQ void m13752_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -617,13 +617,13 @@ KERNEL_FQ void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -632,7 +632,7 @@ KERNEL_FQ void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -640,7 +640,7 @@ KERNEL_FQ void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13753-pure.cl b/OpenCL/m13753-pure.cl index 5d76f0637..dcc55ba27 100644 --- a/OpenCL/m13753-pure.cl +++ b/OpenCL/m13753-pure.cl @@ -257,18 +257,18 @@ KERNEL_FQ void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) * keyboard layout shared */ - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -313,7 +313,7 @@ KERNEL_FQ void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); sha256_hmac_ctx_t sha256_hmac_ctx; @@ -337,7 +337,7 @@ KERNEL_FQ void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 48; i += 8, j += 1) { @@ -397,23 +397,23 @@ KERNEL_FQ void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -474,7 +474,7 @@ KERNEL_FQ void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -605,7 +605,7 @@ KERNEL_FQ void m13753_loop_extended (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -687,13 +687,13 @@ KERNEL_FQ void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -702,7 +702,7 @@ KERNEL_FQ void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -710,7 +710,7 @@ KERNEL_FQ void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -718,7 +718,7 @@ KERNEL_FQ void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13771-pure.cl b/OpenCL/m13771-pure.cl index b22738aa1..446464e01 100644 --- a/OpenCL/m13771-pure.cl +++ b/OpenCL/m13771-pure.cl @@ -183,13 +183,13 @@ KERNEL_FQ void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -218,7 +218,7 @@ KERNEL_FQ void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -263,7 +263,7 @@ KERNEL_FQ void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); streebog512_hmac_ctx_t streebog512_hmac_ctx; @@ -305,7 +305,7 @@ KERNEL_FQ void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) tmps[gid].opad_raw[6] = streebog512_hmac_ctx.opad.s[6]; tmps[gid].opad_raw[7] = streebog512_hmac_ctx.opad.s[7]; - streebog512_hmac_update_global_swap (&streebog512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + streebog512_hmac_update_global_swap (&streebog512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -391,23 +391,23 @@ KERNEL_FQ void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -489,7 +489,7 @@ KERNEL_FQ void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -620,7 +620,7 @@ KERNEL_FQ void m13771_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -692,13 +692,13 @@ KERNEL_FQ void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -707,7 +707,7 @@ KERNEL_FQ void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13772-pure.cl b/OpenCL/m13772-pure.cl index 7d189e4e3..c154ba34e 100644 --- a/OpenCL/m13772-pure.cl +++ b/OpenCL/m13772-pure.cl @@ -234,13 +234,13 @@ KERNEL_FQ void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -269,7 +269,7 @@ KERNEL_FQ void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -314,7 +314,7 @@ KERNEL_FQ void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); streebog512_hmac_ctx_t streebog512_hmac_ctx; @@ -356,7 +356,7 @@ KERNEL_FQ void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) tmps[gid].opad_raw[6] = streebog512_hmac_ctx.opad.s[6]; tmps[gid].opad_raw[7] = streebog512_hmac_ctx.opad.s[7]; - streebog512_hmac_update_global_swap (&streebog512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + streebog512_hmac_update_global_swap (&streebog512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 16; i += 8, j += 1) { @@ -442,23 +442,23 @@ KERNEL_FQ void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -540,7 +540,7 @@ KERNEL_FQ void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -671,7 +671,7 @@ KERNEL_FQ void m13772_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -748,13 +748,13 @@ KERNEL_FQ void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -763,7 +763,7 @@ KERNEL_FQ void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -771,7 +771,7 @@ KERNEL_FQ void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13773-pure.cl b/OpenCL/m13773-pure.cl index f257ec5eb..45f7e3225 100644 --- a/OpenCL/m13773-pure.cl +++ b/OpenCL/m13773-pure.cl @@ -299,13 +299,13 @@ KERNEL_FQ void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_cnt; + const int keyboard_layout_mapping_cnt = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_cnt; LOCAL_VK keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { - s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET].keyboard_layout_mapping_buf[i]; + s_keyboard_layout_mapping_buf[i] = esalt_bufs[DIGESTS_OFFSET_HOST].keyboard_layout_mapping_buf[i]; } SYNC_THREADS (); @@ -334,7 +334,7 @@ KERNEL_FQ void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -379,7 +379,7 @@ KERNEL_FQ void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) hc_execute_keyboard_layout_mapping (w, pw_len, s_keyboard_layout_mapping_buf, keyboard_layout_mapping_cnt); - pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET]); + pw_len = hc_apply_keyfile_vc (w, pw_len, &esalt_bufs[DIGESTS_OFFSET_HOST]); streebog512_hmac_ctx_t streebog512_hmac_ctx; @@ -421,7 +421,7 @@ KERNEL_FQ void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) tmps[gid].opad_raw[6] = streebog512_hmac_ctx.opad.s[6]; tmps[gid].opad_raw[7] = streebog512_hmac_ctx.opad.s[7]; - streebog512_hmac_update_global_swap (&streebog512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 64); + streebog512_hmac_update_global_swap (&streebog512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 64); for (u32 i = 0, j = 1; i < 24; i += 8, j += 1) { @@ -507,23 +507,23 @@ KERNEL_FQ void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; // this is the pim range check // it is guaranteed that only 0 or 1 innerloops will match a "pim" mark (each 1000 iterations) // therefore the module limits the inner loop iteration count to 1000 // if the key_pim is set, we know that we have to save and check the key for this pim - const int pim_multi = esalt_bufs[DIGESTS_OFFSET].pim_multi; - const int pim_start = esalt_bufs[DIGESTS_OFFSET].pim_start; - const int pim_stop = esalt_bufs[DIGESTS_OFFSET].pim_stop; + const int pim_multi = esalt_bufs[DIGESTS_OFFSET_HOST].pim_multi; + const int pim_start = esalt_bufs[DIGESTS_OFFSET_HOST].pim_start; + const int pim_stop = esalt_bufs[DIGESTS_OFFSET_HOST].pim_stop; int pim = 0; int pim_at = 0; - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { - const int iter_abs = 1 + loop_pos + j; + const int iter_abs = 1 + LOOP_POS + j; if ((iter_abs % pim_multi) == pim_multi - 1) { @@ -605,7 +605,7 @@ KERNEL_FQ void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -736,7 +736,7 @@ KERNEL_FQ void m13773_loop_extended (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pim_check = tmps[gid].pim_check; @@ -818,13 +818,13 @@ KERNEL_FQ void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if (tmps[gid].pim) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } else @@ -833,7 +833,7 @@ KERNEL_FQ void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -841,7 +841,7 @@ KERNEL_FQ void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } @@ -849,7 +849,7 @@ KERNEL_FQ void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { if (hc_atomic_inc (&hashes_shown[0]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m13800_a0-optimized.cl b/OpenCL/m13800_a0-optimized.cl index 043ed0d13..dc6c0752f 100644 --- a/OpenCL/m13800_a0-optimized.cl +++ b/OpenCL/m13800_a0-optimized.cl @@ -446,18 +446,18 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -642,12 +642,12 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -655,17 +655,17 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m13800_a0-pure.cl b/OpenCL/m13800_a0-pure.cl index 3aa9a26f2..81e794c6c 100644 --- a/OpenCL/m13800_a0-pure.cl +++ b/OpenCL/m13800_a0-pure.cl @@ -31,7 +31,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -43,7 +43,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -55,7 +55,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t)) sha256_update_utf16le_swap (&ctx, tmp.i, tmp.pw_len); - sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 128); + sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 128); sha256_final (&ctx); @@ -77,7 +77,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -85,10 +85,10 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -101,7 +101,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -113,7 +113,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t)) sha256_update_utf16le_swap (&ctx, tmp.i, tmp.pw_len); - sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 128); + sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 128); sha256_final (&ctx); diff --git a/OpenCL/m13800_a1-optimized.cl b/OpenCL/m13800_a1-optimized.cl index 4227e48d5..ed37affb3 100644 --- a/OpenCL/m13800_a1-optimized.cl +++ b/OpenCL/m13800_a1-optimized.cl @@ -444,18 +444,18 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -493,7 +493,7 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_ESALT (win8phone_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -696,12 +696,12 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -709,17 +709,17 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -757,7 +757,7 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m13800_a1-pure.cl b/OpenCL/m13800_a1-pure.cl index 69569f0c6..6ec0d29c2 100644 --- a/OpenCL/m13800_a1-pure.cl +++ b/OpenCL/m13800_a1-pure.cl @@ -29,7 +29,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_ESALT (win8phone_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -45,13 +45,13 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_ESALT (win8phone_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; sha256_update_global_utf16le_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); - sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 128); + sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 128); sha256_final (&ctx); @@ -73,7 +73,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_ESALT (win8phone_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -81,10 +81,10 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_ESALT (win8phone_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -101,13 +101,13 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_ESALT (win8phone_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; sha256_update_global_utf16le_swap (&ctx, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); - sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, 128); + sha256_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, 128); sha256_final (&ctx); diff --git a/OpenCL/m13800_a3-optimized.cl b/OpenCL/m13800_a3-optimized.cl index 895d4378c..231671160 100644 --- a/OpenCL/m13800_a3-optimized.cl +++ b/OpenCL/m13800_a3-optimized.cl @@ -422,7 +422,7 @@ DECLSPEC void m13800m (LOCAL_AS u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATT u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -570,10 +570,10 @@ DECLSPEC void m13800s (LOCAL_AS u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATT const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -582,7 +582,7 @@ DECLSPEC void m13800s (LOCAL_AS u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATT u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -758,18 +758,18 @@ KERNEL_FQ void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) @@ -815,18 +815,18 @@ KERNEL_FQ void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) @@ -872,18 +872,18 @@ KERNEL_FQ void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) @@ -929,18 +929,18 @@ KERNEL_FQ void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) @@ -986,18 +986,18 @@ KERNEL_FQ void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) @@ -1043,16 +1043,16 @@ KERNEL_FQ void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = lid; i < 32; i += lsz) { - s_esalt[i] = esalt_bufs[DIGESTS_OFFSET].salt_buf[i]; + s_esalt[i] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m13800_a3-pure.cl b/OpenCL/m13800_a3-pure.cl index fd44322c0..2c34235ff 100644 --- a/OpenCL/m13800_a3-pure.cl +++ b/OpenCL/m13800_a3-pure.cl @@ -29,7 +29,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -50,7 +50,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = esalt_bufs[DIGESTS_OFFSET].salt_buf[idx]; + s[idx] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[idx]; } /** @@ -59,7 +59,7 @@ KERNEL_FQ void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -95,7 +95,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -128,7 +128,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = esalt_bufs[DIGESTS_OFFSET].salt_buf[idx]; + s[idx] = esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf[idx]; } /** @@ -137,7 +137,7 @@ KERNEL_FQ void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m13900_a0-optimized.cl b/OpenCL/m13900_a0-optimized.cl index 731cea1c6..6e4e05906 100644 --- a/OpenCL/m13900_a0-optimized.cl +++ b/OpenCL/m13900_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -81,17 +81,17 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[3]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -282,7 +282,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -308,11 +308,11 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[3]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -320,17 +320,17 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m13900_a0-pure.cl b/OpenCL/m13900_a0-pure.cl index e827466f1..5c6a77b86 100644 --- a/OpenCL/m13900_a0-pure.cl +++ b/OpenCL/m13900_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -206,7 +206,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -214,10 +214,10 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -230,13 +230,13 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m13900_a1-optimized.cl b/OpenCL/m13900_a1-optimized.cl index 89d52dfef..adecf4bf1 100644 --- a/OpenCL/m13900_a1-optimized.cl +++ b/OpenCL/m13900_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -79,17 +79,17 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[3]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -127,7 +127,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -338,7 +338,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -364,11 +364,11 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[3]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -376,17 +376,17 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -424,7 +424,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m13900_a1-pure.cl b/OpenCL/m13900_a1-pure.cl index 4012e1ca6..24ba1c6a5 100644 --- a/OpenCL/m13900_a1-pure.cl +++ b/OpenCL/m13900_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,7 +63,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -75,7 +75,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; @@ -202,7 +202,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -210,10 +210,10 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -224,7 +224,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -236,7 +236,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; diff --git a/OpenCL/m13900_a3-optimized.cl b/OpenCL/m13900_a3-optimized.cl index 87121e5cd..4067fc91a 100644 --- a/OpenCL/m13900_a3-optimized.cl +++ b/OpenCL/m13900_a3-optimized.cl @@ -41,11 +41,11 @@ DECLSPEC void m13900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[3]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[2]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[2]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -53,7 +53,7 @@ DECLSPEC void m13900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -226,20 +226,20 @@ DECLSPEC void m13900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf1[4]; u32 salt_buf2[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); salt_buf2[2] = 0; salt_buf2[3] = 0; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -247,10 +247,10 @@ DECLSPEC void m13900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -259,7 +259,7 @@ DECLSPEC void m13900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -442,7 +442,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -482,7 +482,7 @@ KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) * main */ - m13900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m13900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m13900_m08 (KERN_ATTR_BASIC ()) @@ -512,7 +512,7 @@ KERNEL_FQ void m13900_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -552,7 +552,7 @@ KERNEL_FQ void m13900_m08 (KERN_ATTR_BASIC ()) * main */ - m13900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m13900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m13900_m16 (KERN_ATTR_BASIC ()) @@ -582,7 +582,7 @@ KERNEL_FQ void m13900_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -622,7 +622,7 @@ KERNEL_FQ void m13900_m16 (KERN_ATTR_BASIC ()) * main */ - m13900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m13900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) @@ -652,7 +652,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -692,7 +692,7 @@ KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) * main */ - m13900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m13900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m13900_s08 (KERN_ATTR_BASIC ()) @@ -722,7 +722,7 @@ KERNEL_FQ void m13900_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -762,7 +762,7 @@ KERNEL_FQ void m13900_s08 (KERN_ATTR_BASIC ()) * main */ - m13900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m13900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m13900_s16 (KERN_ATTR_BASIC ()) @@ -792,7 +792,7 @@ KERNEL_FQ void m13900_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -832,5 +832,5 @@ KERNEL_FQ void m13900_s16 (KERN_ATTR_BASIC ()) * main */ - m13900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m13900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m13900_a3-pure.cl b/OpenCL/m13900_a3-pure.cl index a3a105652..fe37efa21 100644 --- a/OpenCL/m13900_a3-pure.cl +++ b/OpenCL/m13900_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -72,7 +72,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -80,7 +80,7 @@ KERNEL_FQ void m13900_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -219,7 +219,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -227,10 +227,10 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -250,7 +250,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -258,7 +258,7 @@ KERNEL_FQ void m13900_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m14000_a0-pure.cl b/OpenCL/m14000_a0-pure.cl index b8fa083e4..4458075cc 100644 --- a/OpenCL/m14000_a0-pure.cl +++ b/OpenCL/m14000_a0-pure.cl @@ -537,7 +537,7 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -563,14 +563,14 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * main */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; @@ -642,7 +642,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -668,8 +668,8 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -677,8 +677,8 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -687,7 +687,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_RULES ()) * main */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; diff --git a/OpenCL/m14000_a1-pure.cl b/OpenCL/m14000_a1-pure.cl index aadc657e2..89e8418a0 100644 --- a/OpenCL/m14000_a1-pure.cl +++ b/OpenCL/m14000_a1-pure.cl @@ -527,7 +527,7 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -553,14 +553,14 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -598,7 +598,7 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -675,7 +675,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -701,8 +701,8 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -710,8 +710,8 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -720,7 +720,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -758,7 +758,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m14000_a3-pure.cl b/OpenCL/m14000_a3-pure.cl index 84b419923..3fdf07ef5 100644 --- a/OpenCL/m14000_a3-pure.cl +++ b/OpenCL/m14000_a3-pure.cl @@ -1767,8 +1767,8 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BITSLICE ()) * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf_pc[0]; - const u32 salt1 = salt_bufs[SALT_POS].salt_buf_pc[1]; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + const u32 salt1 = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; // salt1 first, because this is a 64 bit value actually @@ -1906,7 +1906,7 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BITSLICE ()) * inner loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos += 32) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos += 32) { u32 k00 = K00; u32 k01 = K01; @@ -2120,11 +2120,11 @@ KERNEL_FQ void m14000_mxx (KERN_ATTR_BITSLICE ()) out[62] = D62; out[63] = D63; - if (digests_cnt < 16) + if (DIGESTS_CNT < 16) { - for (u32 d = 0; d < digests_cnt; d++) + for (u32 d = 0; d < DIGESTS_CNT; d++) { - const u32 final_hash_pos = DIGESTS_OFFSET + d; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + d; if (hashes_shown[final_hash_pos]) continue; @@ -2209,8 +2209,8 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BITSLICE ()) * salt */ - const u32 salt0 = salt_bufs[SALT_POS].salt_buf_pc[0]; - const u32 salt1 = salt_bufs[SALT_POS].salt_buf_pc[1]; + const u32 salt0 = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + const u32 salt1 = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; // salt1 first, because this is a 64 bit value actually @@ -2419,7 +2419,7 @@ KERNEL_FQ void m14000_sxx (KERN_ATTR_BITSLICE ()) * inner loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos += 32) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos += 32) { u32 k00 = K00; u32 k01 = K01; diff --git a/OpenCL/m14100_a0-pure.cl b/OpenCL/m14100_a0-pure.cl index e1f9b047e..120d894fd 100644 --- a/OpenCL/m14100_a0-pure.cl +++ b/OpenCL/m14100_a0-pure.cl @@ -581,7 +581,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -607,14 +607,14 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * main */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; @@ -716,7 +716,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -742,8 +742,8 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -751,8 +751,8 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -761,7 +761,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_RULES ()) * main */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; diff --git a/OpenCL/m14100_a1-pure.cl b/OpenCL/m14100_a1-pure.cl index 32836fe99..d6868ded0 100644 --- a/OpenCL/m14100_a1-pure.cl +++ b/OpenCL/m14100_a1-pure.cl @@ -571,7 +571,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -597,14 +597,14 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -642,7 +642,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -754,7 +754,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -780,8 +780,8 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * digest @@ -789,8 +789,8 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -799,7 +799,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -837,7 +837,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m14100_a3-pure.cl b/OpenCL/m14100_a3-pure.cl index c85d58cd5..6373bbf43 100644 --- a/OpenCL/m14100_a3-pure.cl +++ b/OpenCL/m14100_a3-pure.cl @@ -546,8 +546,8 @@ DECLSPEC void m14100m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * Precompute fixed key scheduler @@ -577,7 +577,7 @@ DECLSPEC void m14100m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 w1 = w[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); @@ -635,8 +635,8 @@ DECLSPEC void m14100s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; /** * Precompute fixed key scheduler @@ -644,8 +644,8 @@ DECLSPEC void m14100s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32x iv[2]; - iv[0] = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - iv[1] = digests_buf[DIGESTS_OFFSET].digest_buf[1]; + iv[0] = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + iv[1] = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; const u32x e = (w[4]); const u32x f = (w[5]); @@ -701,7 +701,7 @@ DECLSPEC void m14100s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 w1 = w[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); @@ -776,7 +776,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -807,7 +807,7 @@ KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) * main */ - m14100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m14100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) @@ -850,7 +850,7 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -881,5 +881,5 @@ KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) * main */ - m14100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m14100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m14400_a0-optimized.cl b/OpenCL/m14400_a0-optimized.cl index 8bf9f074f..da48a7653 100644 --- a/OpenCL/m14400_a0-optimized.cl +++ b/OpenCL/m14400_a0-optimized.cl @@ -145,7 +145,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -176,11 +176,11 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -215,7 +215,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_RULES ()) salt_buf3[2] = hc_swap32_S (salt_buf3[2]); salt_buf3[3] = hc_swap32_S (salt_buf3[3]); - const u32 salt_len_orig = salt_bufs[SALT_POS].salt_len; + const u32 salt_len_orig = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_len_new = 2 + salt_len_orig + 2; @@ -223,7 +223,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -416,7 +416,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -447,11 +447,11 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -486,7 +486,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_RULES ()) salt_buf3[2] = hc_swap32_S (salt_buf3[2]); salt_buf3[3] = hc_swap32_S (salt_buf3[3]); - const u32 salt_len_orig = salt_bufs[SALT_POS].salt_len; + const u32 salt_len_orig = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_len_new = 2 + salt_len_orig + 2; @@ -496,17 +496,17 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m14400_a0-pure.cl b/OpenCL/m14400_a0-pure.cl index 9fd8400ad..6c089b91c 100644 --- a/OpenCL/m14400_a0-pure.cl +++ b/OpenCL/m14400_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -91,7 +91,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_RULES ()) sha1_update_64 (&ctx0, d20, d21, d22, d23, 2); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 d40[4]; u32 d41[4]; @@ -121,7 +121,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -302,7 +302,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -310,10 +310,10 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -350,7 +350,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_RULES ()) sha1_update_64 (&ctx0, d20, d21, d22, d23, 2); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 d40[4]; u32 d41[4]; @@ -380,7 +380,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m14400_a1-optimized.cl b/OpenCL/m14400_a1-optimized.cl index 46bf30359..f8a416ca0 100644 --- a/OpenCL/m14400_a1-optimized.cl +++ b/OpenCL/m14400_a1-optimized.cl @@ -145,7 +145,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -176,11 +176,11 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -215,7 +215,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) salt_buf3[2] = hc_swap32_S (salt_buf3[2]); salt_buf3[3] = hc_swap32_S (salt_buf3[3]); - const u32 salt_len_orig = salt_bufs[SALT_POS].salt_len; + const u32 salt_len_orig = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_len_new = 2 + salt_len_orig + 2; @@ -223,7 +223,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -261,7 +261,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -480,7 +480,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -511,11 +511,11 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -550,7 +550,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) salt_buf3[2] = hc_swap32_S (salt_buf3[2]); salt_buf3[3] = hc_swap32_S (salt_buf3[3]); - const u32 salt_len_orig = salt_bufs[SALT_POS].salt_len; + const u32 salt_len_orig = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_len_new = 2 + salt_len_orig + 2; @@ -560,17 +560,17 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -608,7 +608,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m14400_a1-pure.cl b/OpenCL/m14400_a1-pure.cl index 8822b1bbc..8ffceb92a 100644 --- a/OpenCL/m14400_a1-pure.cl +++ b/OpenCL/m14400_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -87,7 +87,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_BASIC ()) sha1_update_64 (&ctx0, d20, d21, d22, d23, 2); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 d40[4]; u32 d41[4]; @@ -117,7 +117,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; @@ -298,7 +298,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -306,10 +306,10 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -344,7 +344,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_BASIC ()) sha1_update_64 (&ctx0, d20, d21, d22, d23, 2); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 d40[4]; u32 d41[4]; @@ -374,7 +374,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m14400_a3-optimized.cl b/OpenCL/m14400_a3-optimized.cl index 39dcc3dd8..e2f732bfa 100644 --- a/OpenCL/m14400_a3-optimized.cl +++ b/OpenCL/m14400_a3-optimized.cl @@ -138,11 +138,11 @@ DECLSPEC void m14400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -177,7 +177,7 @@ DECLSPEC void m14400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = hc_swap32_S (salt_buf3[2]); salt_buf3[3] = hc_swap32_S (salt_buf3[3]); - const u32 salt_len_orig = salt_bufs[SALT_POS].salt_len; + const u32 salt_len_orig = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_len_new = 2 + salt_len_orig + 2; @@ -239,7 +239,7 @@ DECLSPEC void m14400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * loop */ - 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); @@ -382,10 +382,10 @@ DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -399,11 +399,11 @@ DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -438,7 +438,7 @@ DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3[2] = hc_swap32_S (salt_buf3[2]); salt_buf3[3] = hc_swap32_S (salt_buf3[3]); - const u32 salt_len_orig = salt_bufs[SALT_POS].salt_len; + const u32 salt_len_orig = salt_bufs[SALT_POS_HOST].salt_len; const u32 salt_len_new = 2 + salt_len_orig + 2; @@ -500,7 +500,7 @@ DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * loop */ - 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); @@ -655,7 +655,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -695,7 +695,7 @@ KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) * main */ - m14400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m14400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m14400_m08 (KERN_ATTR_BASIC ()) @@ -725,7 +725,7 @@ KERNEL_FQ void m14400_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -765,7 +765,7 @@ KERNEL_FQ void m14400_m08 (KERN_ATTR_BASIC ()) * main */ - m14400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m14400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m14400_m16 (KERN_ATTR_BASIC ()) @@ -795,7 +795,7 @@ KERNEL_FQ void m14400_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -835,7 +835,7 @@ KERNEL_FQ void m14400_m16 (KERN_ATTR_BASIC ()) * main */ - m14400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m14400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) @@ -865,7 +865,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -905,7 +905,7 @@ KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) * main */ - m14400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m14400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m14400_s08 (KERN_ATTR_BASIC ()) @@ -935,7 +935,7 @@ KERNEL_FQ void m14400_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -975,7 +975,7 @@ KERNEL_FQ void m14400_s08 (KERN_ATTR_BASIC ()) * main */ - m14400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m14400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m14400_s16 (KERN_ATTR_BASIC ()) @@ -1005,7 +1005,7 @@ KERNEL_FQ void m14400_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1045,5 +1045,5 @@ KERNEL_FQ void m14400_s16 (KERN_ATTR_BASIC ()) * main */ - m14400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m14400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m14400_a3-pure.cl b/OpenCL/m14400_a3-pure.cl index fc74c3c0d..4bab7c3ff 100644 --- a/OpenCL/m14400_a3-pure.cl +++ b/OpenCL/m14400_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -96,7 +96,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_VECTOR ()) sha1_update_64 (&ctx0, d20, d21, d22, d23, 2); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 d40[4]; u32 d41[4]; @@ -128,7 +128,7 @@ KERNEL_FQ void m14400_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -323,7 +323,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -331,10 +331,10 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -378,7 +378,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_VECTOR ()) sha1_update_64 (&ctx0, d20, d21, d22, d23, 2); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 d40[4]; u32 d41[4]; @@ -410,7 +410,7 @@ KERNEL_FQ void m14400_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m14511_a0-pure.cl b/OpenCL/m14511_a0-pure.cl index 52ff108fc..4b302fd4a 100644 --- a/OpenCL/m14511_a0-pure.cl +++ b/OpenCL/m14511_a0-pure.cl @@ -68,13 +68,13 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -82,7 +82,7 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -158,10 +158,10 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -245,13 +245,13 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -259,10 +259,10 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -275,7 +275,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -351,10 +351,10 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14511_a1-pure.cl b/OpenCL/m14511_a1-pure.cl index 33e337030..39b7b6b67 100644 --- a/OpenCL/m14511_a1-pure.cl +++ b/OpenCL/m14511_a1-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha1_ctx_t ctx0, ctx0_padding; @@ -103,7 +103,7 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -168,10 +168,10 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -254,7 +254,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -262,17 +262,17 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha1_ctx_t ctx0, ctx0_padding; @@ -303,7 +303,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -368,10 +368,10 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14511_a3-pure.cl b/OpenCL/m14511_a3-pure.cl index 3e0afc6cf..dcab86b9f 100644 --- a/OpenCL/m14511_a3-pure.cl +++ b/OpenCL/m14511_a3-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -89,7 +89,7 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -161,10 +161,10 @@ KERNEL_FQ void m14511_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -247,7 +247,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -255,17 +255,17 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -282,7 +282,7 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -354,10 +354,10 @@ KERNEL_FQ void m14511_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14512_a0-pure.cl b/OpenCL/m14512_a0-pure.cl index b33bf2065..9a3fd2d19 100644 --- a/OpenCL/m14512_a0-pure.cl +++ b/OpenCL/m14512_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -122,10 +122,10 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -172,13 +172,13 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -186,10 +186,10 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -202,7 +202,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -278,10 +278,10 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14512_a1-pure.cl b/OpenCL/m14512_a1-pure.cl index 161741e96..e0075b9b9 100644 --- a/OpenCL/m14512_a1-pure.cl +++ b/OpenCL/m14512_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha1_ctx_t ctx0, ctx0_padding; @@ -67,7 +67,7 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -132,10 +132,10 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -182,7 +182,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -190,17 +190,17 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha1_ctx_t ctx0, ctx0_padding; @@ -231,7 +231,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -296,10 +296,10 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14512_a3-pure.cl b/OpenCL/m14512_a3-pure.cl index 47193000b..17feee44c 100644 --- a/OpenCL/m14512_a3-pure.cl +++ b/OpenCL/m14512_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -125,10 +125,10 @@ KERNEL_FQ void m14512_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -175,7 +175,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -183,17 +183,17 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -210,7 +210,7 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -282,10 +282,10 @@ KERNEL_FQ void m14512_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14513_a0-pure.cl b/OpenCL/m14513_a0-pure.cl index a1acc0840..12c34136b 100644 --- a/OpenCL/m14513_a0-pure.cl +++ b/OpenCL/m14513_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -122,10 +122,10 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -173,13 +173,13 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -187,10 +187,10 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -203,7 +203,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -279,10 +279,10 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14513_a1-pure.cl b/OpenCL/m14513_a1-pure.cl index 8bf808a3c..9f497dc56 100644 --- a/OpenCL/m14513_a1-pure.cl +++ b/OpenCL/m14513_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha1_ctx_t ctx0, ctx0_padding; @@ -67,7 +67,7 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -132,10 +132,10 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -183,7 +183,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -191,17 +191,17 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha1_ctx_t ctx0, ctx0_padding; @@ -232,7 +232,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -297,10 +297,10 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14513_a3-pure.cl b/OpenCL/m14513_a3-pure.cl index 0cb812e59..d6fd9a055 100644 --- a/OpenCL/m14513_a3-pure.cl +++ b/OpenCL/m14513_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -125,10 +125,10 @@ KERNEL_FQ void m14513_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -176,7 +176,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -184,17 +184,17 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -211,7 +211,7 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -283,10 +283,10 @@ KERNEL_FQ void m14513_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14521_a0-pure.cl b/OpenCL/m14521_a0-pure.cl index 8607120f1..848372152 100644 --- a/OpenCL/m14521_a0-pure.cl +++ b/OpenCL/m14521_a0-pure.cl @@ -68,13 +68,13 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -82,7 +82,7 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -139,10 +139,10 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -226,13 +226,13 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -240,10 +240,10 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -256,7 +256,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -313,10 +313,10 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14521_a1-pure.cl b/OpenCL/m14521_a1-pure.cl index eaf9af2a5..d646c6368 100644 --- a/OpenCL/m14521_a1-pure.cl +++ b/OpenCL/m14521_a1-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha256_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -135,10 +135,10 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -221,7 +221,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -229,17 +229,17 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha256_ctx_t ctx0; @@ -251,7 +251,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -302,10 +302,10 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14521_a3-pure.cl b/OpenCL/m14521_a3-pure.cl index 17d48d002..88aa55646 100644 --- a/OpenCL/m14521_a3-pure.cl +++ b/OpenCL/m14521_a3-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -89,7 +89,7 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -148,10 +148,10 @@ KERNEL_FQ void m14521_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -234,7 +234,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -242,17 +242,17 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -269,7 +269,7 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -328,10 +328,10 @@ KERNEL_FQ void m14521_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14522_a0-pure.cl b/OpenCL/m14522_a0-pure.cl index ee781b89b..b8ebe619f 100644 --- a/OpenCL/m14522_a0-pure.cl +++ b/OpenCL/m14522_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -103,10 +103,10 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -153,13 +153,13 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -167,10 +167,10 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -183,7 +183,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -240,10 +240,10 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14522_a1-pure.cl b/OpenCL/m14522_a1-pure.cl index 55b330afd..eb2f48a1e 100644 --- a/OpenCL/m14522_a1-pure.cl +++ b/OpenCL/m14522_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha256_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -99,10 +99,10 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -149,7 +149,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -157,17 +157,17 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha256_ctx_t ctx0; @@ -179,7 +179,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -230,10 +230,10 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14522_a3-pure.cl b/OpenCL/m14522_a3-pure.cl index 016632a76..a10db5c66 100644 --- a/OpenCL/m14522_a3-pure.cl +++ b/OpenCL/m14522_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,10 +112,10 @@ KERNEL_FQ void m14522_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -162,7 +162,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -170,17 +170,17 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -197,7 +197,7 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -256,10 +256,10 @@ KERNEL_FQ void m14522_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14523_a0-pure.cl b/OpenCL/m14523_a0-pure.cl index 56e1d288d..71001d97b 100644 --- a/OpenCL/m14523_a0-pure.cl +++ b/OpenCL/m14523_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -103,10 +103,10 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -154,13 +154,13 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -168,10 +168,10 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -184,7 +184,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -241,10 +241,10 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14523_a1-pure.cl b/OpenCL/m14523_a1-pure.cl index 9f4f10794..1229970fa 100644 --- a/OpenCL/m14523_a1-pure.cl +++ b/OpenCL/m14523_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha256_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -99,10 +99,10 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -150,7 +150,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -158,17 +158,17 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha256_ctx_t ctx0; @@ -180,7 +180,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -231,10 +231,10 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14523_a3-pure.cl b/OpenCL/m14523_a3-pure.cl index 373b29002..f8b93c4b7 100644 --- a/OpenCL/m14523_a3-pure.cl +++ b/OpenCL/m14523_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,10 +112,10 @@ KERNEL_FQ void m14523_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -163,7 +163,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -171,17 +171,17 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -198,7 +198,7 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -257,10 +257,10 @@ KERNEL_FQ void m14523_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14531_a0-pure.cl b/OpenCL/m14531_a0-pure.cl index c5c6ef740..0b43682bd 100644 --- a/OpenCL/m14531_a0-pure.cl +++ b/OpenCL/m14531_a0-pure.cl @@ -68,13 +68,13 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -82,7 +82,7 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -139,10 +139,10 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -225,13 +225,13 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -239,10 +239,10 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -255,7 +255,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -312,10 +312,10 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14531_a1-pure.cl b/OpenCL/m14531_a1-pure.cl index 8190a9d56..b13e77d29 100644 --- a/OpenCL/m14531_a1-pure.cl +++ b/OpenCL/m14531_a1-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha512_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -135,10 +135,10 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -221,7 +221,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -229,17 +229,17 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha512_ctx_t ctx0; @@ -251,7 +251,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -302,10 +302,10 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14531_a3-pure.cl b/OpenCL/m14531_a3-pure.cl index aa8a41d7a..07e56dc31 100644 --- a/OpenCL/m14531_a3-pure.cl +++ b/OpenCL/m14531_a3-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -89,7 +89,7 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -148,10 +148,10 @@ KERNEL_FQ void m14531_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -234,7 +234,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -242,17 +242,17 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -269,7 +269,7 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -328,10 +328,10 @@ KERNEL_FQ void m14531_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14532_a0-pure.cl b/OpenCL/m14532_a0-pure.cl index 5f51e9da9..58c1537fa 100644 --- a/OpenCL/m14532_a0-pure.cl +++ b/OpenCL/m14532_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -103,10 +103,10 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -153,13 +153,13 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -167,10 +167,10 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -183,7 +183,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -239,10 +239,10 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14532_a1-pure.cl b/OpenCL/m14532_a1-pure.cl index 7d3b08b9a..1ca055c83 100644 --- a/OpenCL/m14532_a1-pure.cl +++ b/OpenCL/m14532_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha512_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -99,10 +99,10 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -149,7 +149,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -157,17 +157,17 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha512_ctx_t ctx0; @@ -179,7 +179,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -230,10 +230,10 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14532_a3-pure.cl b/OpenCL/m14532_a3-pure.cl index ab3b0645b..e189c94f7 100644 --- a/OpenCL/m14532_a3-pure.cl +++ b/OpenCL/m14532_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,10 +112,10 @@ KERNEL_FQ void m14532_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -162,7 +162,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -170,17 +170,17 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -197,7 +197,7 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -256,10 +256,10 @@ KERNEL_FQ void m14532_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14533_a0-pure.cl b/OpenCL/m14533_a0-pure.cl index 353232f82..90f91fbc7 100644 --- a/OpenCL/m14533_a0-pure.cl +++ b/OpenCL/m14533_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -103,10 +103,10 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -154,13 +154,13 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -168,10 +168,10 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -184,7 +184,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -241,10 +241,10 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14533_a1-pure.cl b/OpenCL/m14533_a1-pure.cl index ce4c4fae1..6b3cb3d8a 100644 --- a/OpenCL/m14533_a1-pure.cl +++ b/OpenCL/m14533_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha512_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -99,10 +99,10 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -150,7 +150,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -158,17 +158,17 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; sha512_ctx_t ctx0; @@ -180,7 +180,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -231,10 +231,10 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14533_a3-pure.cl b/OpenCL/m14533_a3-pure.cl index 41883f4b9..ac03fb9a0 100644 --- a/OpenCL/m14533_a3-pure.cl +++ b/OpenCL/m14533_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,10 +112,10 @@ KERNEL_FQ void m14533_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -163,7 +163,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -171,17 +171,17 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -198,7 +198,7 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -257,10 +257,10 @@ KERNEL_FQ void m14533_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14541_a0-pure.cl b/OpenCL/m14541_a0-pure.cl index 2ed23a0ba..ba50e7b7c 100644 --- a/OpenCL/m14541_a0-pure.cl +++ b/OpenCL/m14541_a0-pure.cl @@ -68,13 +68,13 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -82,7 +82,7 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -158,10 +158,10 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -245,13 +245,13 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -259,10 +259,10 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -275,7 +275,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -351,10 +351,10 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14541_a1-pure.cl b/OpenCL/m14541_a1-pure.cl index f18137677..bf4b33d3d 100644 --- a/OpenCL/m14541_a1-pure.cl +++ b/OpenCL/m14541_a1-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; ripemd160_ctx_t ctx0, ctx0_padding; @@ -103,7 +103,7 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -168,10 +168,10 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -254,7 +254,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -262,17 +262,17 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; ripemd160_ctx_t ctx0, ctx0_padding; @@ -303,7 +303,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -368,10 +368,10 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14541_a3-pure.cl b/OpenCL/m14541_a3-pure.cl index 112b9d452..5a6f97925 100644 --- a/OpenCL/m14541_a3-pure.cl +++ b/OpenCL/m14541_a3-pure.cl @@ -66,13 +66,13 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -89,7 +89,7 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -161,10 +161,10 @@ KERNEL_FQ void m14541_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -247,7 +247,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -255,17 +255,17 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -282,7 +282,7 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -354,10 +354,10 @@ KERNEL_FQ void m14541_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14542_a0-pure.cl b/OpenCL/m14542_a0-pure.cl index bd1038fb9..6a2695649 100644 --- a/OpenCL/m14542_a0-pure.cl +++ b/OpenCL/m14542_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -122,10 +122,10 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -172,13 +172,13 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -186,10 +186,10 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -202,7 +202,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -278,10 +278,10 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14542_a1-pure.cl b/OpenCL/m14542_a1-pure.cl index 06ade940a..3916c7822 100644 --- a/OpenCL/m14542_a1-pure.cl +++ b/OpenCL/m14542_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; ripemd160_ctx_t ctx0, ctx0_padding; @@ -67,7 +67,7 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -132,10 +132,10 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -182,7 +182,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -190,17 +190,17 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; ripemd160_ctx_t ctx0, ctx0_padding; @@ -231,7 +231,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -296,10 +296,10 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14542_a3-pure.cl b/OpenCL/m14542_a3-pure.cl index 5e37f44b1..2c5628988 100644 --- a/OpenCL/m14542_a3-pure.cl +++ b/OpenCL/m14542_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -125,10 +125,10 @@ KERNEL_FQ void m14542_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -175,7 +175,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -183,17 +183,17 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -210,7 +210,7 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -282,10 +282,10 @@ KERNEL_FQ void m14542_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14543_a0-pure.cl b/OpenCL/m14543_a0-pure.cl index 13b0910c8..2161c33a6 100644 --- a/OpenCL/m14543_a0-pure.cl +++ b/OpenCL/m14543_a0-pure.cl @@ -32,13 +32,13 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -46,7 +46,7 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -122,10 +122,10 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -173,13 +173,13 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -187,10 +187,10 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -203,7 +203,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -279,10 +279,10 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14543_a1-pure.cl b/OpenCL/m14543_a1-pure.cl index 3db0f2791..8a518f8ea 100644 --- a/OpenCL/m14543_a1-pure.cl +++ b/OpenCL/m14543_a1-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; ripemd160_ctx_t ctx0, ctx0_padding; @@ -67,7 +67,7 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -132,10 +132,10 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -183,7 +183,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -191,17 +191,17 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; ripemd160_ctx_t ctx0, ctx0_padding; @@ -232,7 +232,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { ripemd160_ctx_t ctx = ctx0; @@ -297,10 +297,10 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14543_a3-pure.cl b/OpenCL/m14543_a3-pure.cl index e8f8977fa..b63ab2fb8 100644 --- a/OpenCL/m14543_a3-pure.cl +++ b/OpenCL/m14543_a3-pure.cl @@ -30,13 +30,13 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -53,7 +53,7 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -125,10 +125,10 @@ KERNEL_FQ void m14543_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -176,7 +176,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -184,17 +184,17 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -211,7 +211,7 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -283,10 +283,10 @@ KERNEL_FQ void m14543_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14551_a0-pure.cl b/OpenCL/m14551_a0-pure.cl index a726661eb..7edec58e4 100644 --- a/OpenCL/m14551_a0-pure.cl +++ b/OpenCL/m14551_a0-pure.cl @@ -95,13 +95,13 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -109,7 +109,7 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -166,10 +166,10 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -280,13 +280,13 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -294,10 +294,10 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -310,7 +310,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -367,10 +367,10 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14551_a1-pure.cl b/OpenCL/m14551_a1-pure.cl index eecb18f89..434d1a94b 100644 --- a/OpenCL/m14551_a1-pure.cl +++ b/OpenCL/m14551_a1-pure.cl @@ -93,13 +93,13 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; whirlpool_ctx_t ctx0; @@ -111,7 +111,7 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -162,10 +162,10 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -275,7 +275,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -283,17 +283,17 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; whirlpool_ctx_t ctx0; @@ -305,7 +305,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -356,10 +356,10 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14551_a3-pure.cl b/OpenCL/m14551_a3-pure.cl index b6a048453..1f371b446 100644 --- a/OpenCL/m14551_a3-pure.cl +++ b/OpenCL/m14551_a3-pure.cl @@ -93,13 +93,13 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -116,7 +116,7 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -175,10 +175,10 @@ KERNEL_FQ void m14551_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT @@ -288,7 +288,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -296,17 +296,17 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 aes_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -323,7 +323,7 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -382,10 +382,10 @@ KERNEL_FQ void m14551_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[0]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[1]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[2]), - hc_swap32_S(salt_bufs[SALT_POS].salt_buf[3]) + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[0]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[1]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[2]), + hc_swap32_S(salt_bufs[SALT_POS_HOST].salt_buf[3]) }; // CT diff --git a/OpenCL/m14552_a0-pure.cl b/OpenCL/m14552_a0-pure.cl index 2b8456281..62805f40c 100644 --- a/OpenCL/m14552_a0-pure.cl +++ b/OpenCL/m14552_a0-pure.cl @@ -77,13 +77,13 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -91,7 +91,7 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -148,10 +148,10 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -243,13 +243,13 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -257,10 +257,10 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -273,7 +273,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -330,10 +330,10 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14552_a1-pure.cl b/OpenCL/m14552_a1-pure.cl index 0f6968ba6..ef2419e67 100644 --- a/OpenCL/m14552_a1-pure.cl +++ b/OpenCL/m14552_a1-pure.cl @@ -75,13 +75,13 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; whirlpool_ctx_t ctx0; @@ -93,7 +93,7 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -144,10 +144,10 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -239,7 +239,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -247,17 +247,17 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; whirlpool_ctx_t ctx0; @@ -269,7 +269,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -320,10 +320,10 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14552_a3-pure.cl b/OpenCL/m14552_a3-pure.cl index 906d6ae09..01be245fe 100644 --- a/OpenCL/m14552_a3-pure.cl +++ b/OpenCL/m14552_a3-pure.cl @@ -75,13 +75,13 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -98,7 +98,7 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -157,10 +157,10 @@ KERNEL_FQ void m14552_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -252,7 +252,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -260,17 +260,17 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 serpent_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -287,7 +287,7 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -346,10 +346,10 @@ KERNEL_FQ void m14552_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14553_a0-pure.cl b/OpenCL/m14553_a0-pure.cl index de6be29fd..1a1508f2e 100644 --- a/OpenCL/m14553_a0-pure.cl +++ b/OpenCL/m14553_a0-pure.cl @@ -77,13 +77,13 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; COPY_PW (pws[gid]); @@ -91,7 +91,7 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -148,10 +148,10 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -244,13 +244,13 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; /** * digest @@ -258,10 +258,10 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -274,7 +274,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -331,10 +331,10 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_RULES_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14553_a1-pure.cl b/OpenCL/m14553_a1-pure.cl index d5e45a940..212459b9e 100644 --- a/OpenCL/m14553_a1-pure.cl +++ b/OpenCL/m14553_a1-pure.cl @@ -75,13 +75,13 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; whirlpool_ctx_t ctx0; @@ -93,7 +93,7 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -144,10 +144,10 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -240,7 +240,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -248,17 +248,17 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; whirlpool_ctx_t ctx0; @@ -270,7 +270,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_ESALT (cryptoapi_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { whirlpool_ctx_t ctx = ctx0; @@ -321,10 +321,10 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14553_a3-pure.cl b/OpenCL/m14553_a3-pure.cl index f1b2eaccf..b7d205d53 100644 --- a/OpenCL/m14553_a3-pure.cl +++ b/OpenCL/m14553_a3-pure.cl @@ -75,13 +75,13 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -98,7 +98,7 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -157,10 +157,10 @@ KERNEL_FQ void m14553_mxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT @@ -253,7 +253,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -261,17 +261,17 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 twofish_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; const u32 pw_len = pws[gid].pw_len; @@ -288,7 +288,7 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -347,10 +347,10 @@ KERNEL_FQ void m14553_sxx (KERN_ATTR_VECTOR_ESALT (cryptoapi_t)) // IV const u32 iv[4] = { - salt_bufs[SALT_POS].salt_buf[0], - salt_bufs[SALT_POS].salt_buf[1], - salt_bufs[SALT_POS].salt_buf[2], - salt_bufs[SALT_POS].salt_buf[3] + salt_bufs[SALT_POS_HOST].salt_buf[0], + salt_bufs[SALT_POS_HOST].salt_buf[1], + salt_bufs[SALT_POS_HOST].salt_buf[2], + salt_bufs[SALT_POS_HOST].salt_buf[3] }; // CT diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl index 9827e2c4f..debda1379 100644 --- a/OpenCL/m14611-pure.cl +++ b/OpenCL/m14611-pure.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m14611_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -157,9 +157,9 @@ KERNEL_FQ void m14611_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad32[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 5, j += 1) { @@ -209,7 +209,7 @@ KERNEL_FQ void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -226,7 +226,7 @@ KERNEL_FQ void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[3] = packv (tmps, opad32, gid, 3); opad[4] = packv (tmps, opad32, gid, 4); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 5) { @@ -245,7 +245,7 @@ KERNEL_FQ void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[3] = packv (tmps, out32, gid, i + 3); out[4] = packv (tmps, out32, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -349,7 +349,7 @@ KERNEL_FQ void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -357,7 +357,7 @@ KERNEL_FQ void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha1_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); + luks_af_sha1_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); // check entropy @@ -365,9 +365,9 @@ KERNEL_FQ void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl index eb92f69d7..69c695214 100644 --- a/OpenCL/m14612-pure.cl +++ b/OpenCL/m14612-pure.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m14612_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -157,9 +157,9 @@ KERNEL_FQ void m14612_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad32[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 5, j += 1) { @@ -209,7 +209,7 @@ KERNEL_FQ void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -226,7 +226,7 @@ KERNEL_FQ void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[3] = packv (tmps, opad32, gid, 3); opad[4] = packv (tmps, opad32, gid, 4); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 5) { @@ -245,7 +245,7 @@ KERNEL_FQ void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[3] = packv (tmps, out32, gid, i + 3); out[4] = packv (tmps, out32, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -296,7 +296,7 @@ KERNEL_FQ void m14612_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -304,7 +304,7 @@ KERNEL_FQ void m14612_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha1_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_sha1_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -312,9 +312,9 @@ KERNEL_FQ void m14612_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl index db6fbb952..074f19f33 100644 --- a/OpenCL/m14613-pure.cl +++ b/OpenCL/m14613-pure.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m14613_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -157,9 +157,9 @@ KERNEL_FQ void m14613_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad32[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 5, j += 1) { @@ -209,7 +209,7 @@ KERNEL_FQ void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -226,7 +226,7 @@ KERNEL_FQ void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[3] = packv (tmps, opad32, gid, 3); opad[4] = packv (tmps, opad32, gid, 4); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 5) { @@ -245,7 +245,7 @@ KERNEL_FQ void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[3] = packv (tmps, out32, gid, i + 3); out[4] = packv (tmps, out32, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -296,7 +296,7 @@ KERNEL_FQ void m14613_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -304,7 +304,7 @@ KERNEL_FQ void m14613_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha1_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_sha1_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -312,9 +312,9 @@ KERNEL_FQ void m14613_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl index 8a998bb05..514637eda 100644 --- a/OpenCL/m14621-pure.cl +++ b/OpenCL/m14621-pure.cl @@ -145,7 +145,7 @@ KERNEL_FQ void m14621_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -169,9 +169,9 @@ KERNEL_FQ void m14621_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad32[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 8, j += 1) { @@ -227,7 +227,7 @@ KERNEL_FQ void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -250,7 +250,7 @@ KERNEL_FQ void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[6] = packv (tmps, opad32, gid, 6); opad[7] = packv (tmps, opad32, gid, 7); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 8) { @@ -275,7 +275,7 @@ KERNEL_FQ void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[6] = packv (tmps, out32, gid, i + 6); out[7] = packv (tmps, out32, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -388,7 +388,7 @@ KERNEL_FQ void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -396,7 +396,7 @@ KERNEL_FQ void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha256_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); + luks_af_sha256_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); // check entropy @@ -404,9 +404,9 @@ KERNEL_FQ void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl index 5215be024..2e7cb4623 100644 --- a/OpenCL/m14622-pure.cl +++ b/OpenCL/m14622-pure.cl @@ -145,7 +145,7 @@ KERNEL_FQ void m14622_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -169,9 +169,9 @@ KERNEL_FQ void m14622_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad32[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 8, j += 1) { @@ -227,7 +227,7 @@ KERNEL_FQ void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -250,7 +250,7 @@ KERNEL_FQ void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[6] = packv (tmps, opad32, gid, 6); opad[7] = packv (tmps, opad32, gid, 7); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 8) { @@ -275,7 +275,7 @@ KERNEL_FQ void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[6] = packv (tmps, out32, gid, i + 6); out[7] = packv (tmps, out32, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -335,7 +335,7 @@ KERNEL_FQ void m14622_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -343,7 +343,7 @@ KERNEL_FQ void m14622_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha256_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_sha256_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -351,9 +351,9 @@ KERNEL_FQ void m14622_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl index e3b2b3e63..f477cdd2e 100644 --- a/OpenCL/m14623-pure.cl +++ b/OpenCL/m14623-pure.cl @@ -145,7 +145,7 @@ KERNEL_FQ void m14623_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -169,9 +169,9 @@ KERNEL_FQ void m14623_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad32[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 8, j += 1) { @@ -227,7 +227,7 @@ KERNEL_FQ void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -250,7 +250,7 @@ KERNEL_FQ void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[6] = packv (tmps, opad32, gid, 6); opad[7] = packv (tmps, opad32, gid, 7); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 8) { @@ -275,7 +275,7 @@ KERNEL_FQ void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[6] = packv (tmps, out32, gid, i + 6); out[7] = packv (tmps, out32, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -335,7 +335,7 @@ KERNEL_FQ void m14623_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -343,7 +343,7 @@ KERNEL_FQ void m14623_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha256_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_sha256_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -351,9 +351,9 @@ KERNEL_FQ void m14623_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl index a2bec808f..65628d775 100644 --- a/OpenCL/m14631-pure.cl +++ b/OpenCL/m14631-pure.cl @@ -161,7 +161,7 @@ KERNEL_FQ void m14631_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -185,9 +185,9 @@ KERNEL_FQ void m14631_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad64[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad64[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 16, j += 1) { @@ -263,7 +263,7 @@ KERNEL_FQ void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -286,7 +286,7 @@ KERNEL_FQ void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[6] = pack64v (tmps, opad64, gid, 6); opad[7] = pack64v (tmps, opad64, gid, 7); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 16) { @@ -311,7 +311,7 @@ KERNEL_FQ void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[6] = pack64v (tmps, out64, gid, i + 6); out[7] = pack64v (tmps, out64, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -444,7 +444,7 @@ KERNEL_FQ void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -452,7 +452,7 @@ KERNEL_FQ void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha512_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); + luks_af_sha512_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); // check entropy @@ -460,9 +460,9 @@ KERNEL_FQ void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl index f76b3a40e..a823670fd 100644 --- a/OpenCL/m14632-pure.cl +++ b/OpenCL/m14632-pure.cl @@ -161,7 +161,7 @@ KERNEL_FQ void m14632_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -185,9 +185,9 @@ KERNEL_FQ void m14632_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad64[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad64[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 16, j += 1) { @@ -263,7 +263,7 @@ KERNEL_FQ void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -286,7 +286,7 @@ KERNEL_FQ void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[6] = pack64v (tmps, opad64, gid, 6); opad[7] = pack64v (tmps, opad64, gid, 7); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 16) { @@ -311,7 +311,7 @@ KERNEL_FQ void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[6] = pack64v (tmps, out64, gid, i + 6); out[7] = pack64v (tmps, out64, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -391,7 +391,7 @@ KERNEL_FQ void m14632_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -399,7 +399,7 @@ KERNEL_FQ void m14632_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha512_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_sha512_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -407,9 +407,9 @@ KERNEL_FQ void m14632_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl index 5a72fdbe5..a4ae2f25e 100644 --- a/OpenCL/m14633-pure.cl +++ b/OpenCL/m14633-pure.cl @@ -161,7 +161,7 @@ KERNEL_FQ void m14633_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -185,9 +185,9 @@ KERNEL_FQ void m14633_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad64[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad64[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 16, j += 1) { @@ -263,7 +263,7 @@ KERNEL_FQ void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -286,7 +286,7 @@ KERNEL_FQ void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[6] = pack64v (tmps, opad64, gid, 6); opad[7] = pack64v (tmps, opad64, gid, 7); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 16) { @@ -311,7 +311,7 @@ KERNEL_FQ void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[6] = pack64v (tmps, out64, gid, i + 6); out[7] = pack64v (tmps, out64, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -391,7 +391,7 @@ KERNEL_FQ void m14633_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -399,7 +399,7 @@ KERNEL_FQ void m14633_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_sha512_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_sha512_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -407,9 +407,9 @@ KERNEL_FQ void m14633_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl index 87572c0fc..3062f93f7 100644 --- a/OpenCL/m14641-pure.cl +++ b/OpenCL/m14641-pure.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m14641_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -157,9 +157,9 @@ KERNEL_FQ void m14641_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad32[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 5, j += 1) { @@ -209,7 +209,7 @@ KERNEL_FQ void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -226,7 +226,7 @@ KERNEL_FQ void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[3] = packv (tmps, opad32, gid, 3); opad[4] = packv (tmps, opad32, gid, 4); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 5) { @@ -245,7 +245,7 @@ KERNEL_FQ void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[3] = packv (tmps, out32, gid, i + 3); out[4] = packv (tmps, out32, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -349,7 +349,7 @@ KERNEL_FQ void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -357,7 +357,7 @@ KERNEL_FQ void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_ripemd160_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); + luks_af_ripemd160_then_aes_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); // check entropy @@ -365,9 +365,9 @@ KERNEL_FQ void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl index 0988bee8f..be033eaa5 100644 --- a/OpenCL/m14642-pure.cl +++ b/OpenCL/m14642-pure.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m14642_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -157,9 +157,9 @@ KERNEL_FQ void m14642_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad32[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 5, j += 1) { @@ -209,7 +209,7 @@ KERNEL_FQ void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -226,7 +226,7 @@ KERNEL_FQ void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[3] = packv (tmps, opad32, gid, 3); opad[4] = packv (tmps, opad32, gid, 4); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 5) { @@ -245,7 +245,7 @@ KERNEL_FQ void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[3] = packv (tmps, out32, gid, i + 3); out[4] = packv (tmps, out32, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -296,7 +296,7 @@ KERNEL_FQ void m14642_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -304,7 +304,7 @@ KERNEL_FQ void m14642_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_ripemd160_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_ripemd160_then_serpent_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -312,9 +312,9 @@ KERNEL_FQ void m14642_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl index 246934d95..3a33c8cf1 100644 --- a/OpenCL/m14643-pure.cl +++ b/OpenCL/m14643-pure.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m14643_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; ripemd160_hmac_ctx_t ripemd160_hmac_ctx; @@ -157,9 +157,9 @@ KERNEL_FQ void m14643_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) tmps[gid].opad32[3] = ripemd160_hmac_ctx.opad.h[3]; tmps[gid].opad32[4] = ripemd160_hmac_ctx.opad.h[4]; - ripemd160_hmac_update_global (&ripemd160_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + ripemd160_hmac_update_global (&ripemd160_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); - const u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + const u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0, j = 1; i < ((key_size / 8) / 4); i += 5, j += 1) { @@ -209,7 +209,7 @@ KERNEL_FQ void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -226,7 +226,7 @@ KERNEL_FQ void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) opad[3] = packv (tmps, opad32, gid, 3); opad[4] = packv (tmps, opad32, gid, 4); - u32 key_size = esalt_bufs[DIGESTS_OFFSET].key_size; + u32 key_size = esalt_bufs[DIGESTS_OFFSET_HOST].key_size; for (u32 i = 0; i < ((key_size / 8) / 4); i += 5) { @@ -245,7 +245,7 @@ KERNEL_FQ void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) out[3] = packv (tmps, out32, gid, i + 3); out[4] = packv (tmps, out32, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -296,7 +296,7 @@ KERNEL_FQ void m14643_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // decrypt AF with first pbkdf2 result // merge AF to masterkey @@ -304,7 +304,7 @@ KERNEL_FQ void m14643_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) u32 pt_buf[128]; - luks_af_ripemd160_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET], &tmps[gid], pt_buf); + luks_af_ripemd160_then_twofish_decrypt (&esalt_bufs[DIGESTS_OFFSET_HOST], &tmps[gid], pt_buf); // check entropy @@ -312,9 +312,9 @@ KERNEL_FQ void m14643_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) if (entropy < MAX_ENTROPY) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m14700-pure.cl b/OpenCL/m14700-pure.cl index a716d4f5d..68ec6d977 100644 --- a/OpenCL/m14700-pure.cl +++ b/OpenCL/m14700-pure.cl @@ -79,7 +79,7 @@ KERNEL_FQ void m14700_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -97,7 +97,7 @@ KERNEL_FQ void m14700_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -147,7 +147,7 @@ KERNEL_FQ void m14700_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -181,7 +181,7 @@ KERNEL_FQ void m14700_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -285,7 +285,7 @@ KERNEL_FQ void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -310,21 +310,21 @@ KERNEL_FQ void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back u32 cipher[4]; - cipher[0] = esalt_bufs[DIGESTS_OFFSET].wpky[0]; - cipher[1] = esalt_bufs[DIGESTS_OFFSET].wpky[1]; + cipher[0] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[0]; + cipher[1] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[1]; cipher[2] = 0; cipher[3] = 0; u32 lsb[8]; - lsb[0] = esalt_bufs[DIGESTS_OFFSET].wpky[8]; - lsb[1] = esalt_bufs[DIGESTS_OFFSET].wpky[9]; - lsb[2] = esalt_bufs[DIGESTS_OFFSET].wpky[6]; - lsb[3] = esalt_bufs[DIGESTS_OFFSET].wpky[7]; - lsb[4] = esalt_bufs[DIGESTS_OFFSET].wpky[4]; - lsb[5] = esalt_bufs[DIGESTS_OFFSET].wpky[5]; - lsb[6] = esalt_bufs[DIGESTS_OFFSET].wpky[2]; - lsb[7] = esalt_bufs[DIGESTS_OFFSET].wpky[3]; + lsb[0] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[8]; + lsb[1] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[9]; + lsb[2] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[6]; + lsb[3] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[7]; + lsb[4] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[4]; + lsb[5] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[5]; + lsb[6] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[2]; + lsb[7] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[3]; for (int j = 5; j >= 0; j--) { @@ -379,9 +379,9 @@ KERNEL_FQ void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_back if ((cipher[0] == 0xa6a6a6a6) && (cipher[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m14800-pure.cl b/OpenCL/m14800-pure.cl index dcf2c956f..831caf717 100644 --- a/OpenCL/m14800-pure.cl +++ b/OpenCL/m14800-pure.cl @@ -119,7 +119,7 @@ KERNEL_FQ void m14800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -148,11 +148,11 @@ KERNEL_FQ void m14800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba u32 w2[4]; u32 w3[4]; - w0[0] = esalt_bufs[DIGESTS_OFFSET].dpsl[0]; - w0[1] = esalt_bufs[DIGESTS_OFFSET].dpsl[1]; - w0[2] = esalt_bufs[DIGESTS_OFFSET].dpsl[2]; - w0[3] = esalt_bufs[DIGESTS_OFFSET].dpsl[3]; - w1[0] = esalt_bufs[DIGESTS_OFFSET].dpsl[4]; + w0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].dpsl[0]; + w0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].dpsl[1]; + w0[2] = esalt_bufs[DIGESTS_OFFSET_HOST].dpsl[2]; + w0[3] = esalt_bufs[DIGESTS_OFFSET_HOST].dpsl[3]; + w1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].dpsl[4]; w1[1] = 0; w1[2] = 0; w1[3] = 0; @@ -216,7 +216,7 @@ KERNEL_FQ void m14800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -262,7 +262,7 @@ KERNEL_FQ void m14800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -326,7 +326,7 @@ KERNEL_FQ void m14800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_b const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -366,7 +366,7 @@ KERNEL_FQ void m14800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_b tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -411,7 +411,7 @@ KERNEL_FQ void m14800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_b { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -445,7 +445,7 @@ KERNEL_FQ void m14800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_b out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -574,21 +574,21 @@ KERNEL_FQ void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba u32 cipher[4]; - cipher[0] = esalt_bufs[DIGESTS_OFFSET].wpky[0]; - cipher[1] = esalt_bufs[DIGESTS_OFFSET].wpky[1]; + cipher[0] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[0]; + cipher[1] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[1]; cipher[2] = 0; cipher[3] = 0; u32 lsb[8]; - lsb[0] = esalt_bufs[DIGESTS_OFFSET].wpky[8]; - lsb[1] = esalt_bufs[DIGESTS_OFFSET].wpky[9]; - lsb[2] = esalt_bufs[DIGESTS_OFFSET].wpky[6]; - lsb[3] = esalt_bufs[DIGESTS_OFFSET].wpky[7]; - lsb[4] = esalt_bufs[DIGESTS_OFFSET].wpky[4]; - lsb[5] = esalt_bufs[DIGESTS_OFFSET].wpky[5]; - lsb[6] = esalt_bufs[DIGESTS_OFFSET].wpky[2]; - lsb[7] = esalt_bufs[DIGESTS_OFFSET].wpky[3]; + lsb[0] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[8]; + lsb[1] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[9]; + lsb[2] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[6]; + lsb[3] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[7]; + lsb[4] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[4]; + lsb[5] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[5]; + lsb[6] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[2]; + lsb[7] = esalt_bufs[DIGESTS_OFFSET_HOST].wpky[3]; for (int j = 5; j >= 0; j--) { @@ -643,9 +643,9 @@ KERNEL_FQ void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba if ((cipher[0] == 0xa6a6a6a6) && (cipher[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl index f5e78af0b..61cf4ad48 100644 --- a/OpenCL/m14900_a0-optimized.cl +++ b/OpenCL/m14900_a0-optimized.cl @@ -128,7 +128,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -152,13 +152,13 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 KP = salt_bufs[SALT_POS].salt_buf[0]; + const u32 KP = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * main */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -219,7 +219,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -243,7 +243,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 KP = salt_bufs[SALT_POS].salt_buf[0]; + const u32 KP = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -251,7 +251,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -261,7 +261,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_RULES ()) * main */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m14900_a1-optimized.cl b/OpenCL/m14900_a1-optimized.cl index a2229eca3..6c962c8d5 100644 --- a/OpenCL/m14900_a1-optimized.cl +++ b/OpenCL/m14900_a1-optimized.cl @@ -126,7 +126,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -150,13 +150,13 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 KP = salt_bufs[SALT_POS].salt_buf[0]; + const u32 KP = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -194,7 +194,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -281,7 +281,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -305,7 +305,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 KP = salt_bufs[SALT_POS].salt_buf[0]; + const u32 KP = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -313,7 +313,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -323,7 +323,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -361,7 +361,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m14900_a3-optimized.cl b/OpenCL/m14900_a3-optimized.cl index caf6a2ee0..68a08bdd2 100644 --- a/OpenCL/m14900_a3-optimized.cl +++ b/OpenCL/m14900_a3-optimized.cl @@ -116,7 +116,7 @@ DECLSPEC void m14900m (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3 * salt */ - const u32 KP = salt_bufs[SALT_POS].salt_buf[0]; + const u32 KP = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -124,7 +124,7 @@ DECLSPEC void m14900m (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3 u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -164,7 +164,7 @@ DECLSPEC void m14900s (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3 * salt */ - const u32 KP = salt_bufs[SALT_POS].salt_buf[0]; + const u32 KP = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -172,7 +172,7 @@ DECLSPEC void m14900s (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3 const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0, @@ -184,7 +184,7 @@ DECLSPEC void m14900s (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3 u32 w0l = w0[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -234,7 +234,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -274,7 +274,7 @@ KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) * main */ - m14900m (s_ftable, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m14900m (s_ftable, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m14900_m08 (KERN_ATTR_BASIC ()) @@ -308,7 +308,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -348,7 +348,7 @@ KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) * main */ - m14900s (s_ftable, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m14900s (s_ftable, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m14900_s08 (KERN_ATTR_BASIC ()) diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl index 707207686..edcdf32d2 100644 --- a/OpenCL/m15000_a0-optimized.cl +++ b/OpenCL/m15000_a0-optimized.cl @@ -129,7 +129,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -154,30 +154,30 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -334,7 +334,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -356,10 +356,10 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -371,30 +371,30 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m15000_a0-pure.cl b/OpenCL/m15000_a0-pure.cl index 0ed3e4c50..49f2488df 100644 --- a/OpenCL/m15000_a0-pure.cl +++ b/OpenCL/m15000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -80,7 +80,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -88,10 +88,10 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -100,20 +100,20 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m15000_a1-optimized.cl b/OpenCL/m15000_a1-optimized.cl index 7249885e4..c486044a0 100644 --- a/OpenCL/m15000_a1-optimized.cl +++ b/OpenCL/m15000_a1-optimized.cl @@ -127,7 +127,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -152,30 +152,30 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -213,7 +213,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -392,7 +392,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -417,24 +417,24 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -442,17 +442,17 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -490,7 +490,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m15000_a1-pure.cl b/OpenCL/m15000_a1-pure.cl index 28a58c341..09996733c 100644 --- a/OpenCL/m15000_a1-pure.cl +++ b/OpenCL/m15000_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -76,7 +76,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -84,23 +84,23 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha512_ctx_t ctx0; @@ -113,7 +113,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m15000_a3-optimized.cl b/OpenCL/m15000_a3-optimized.cl index 8c1d20a77..7e63e0af6 100644 --- a/OpenCL/m15000_a3-optimized.cl +++ b/OpenCL/m15000_a3-optimized.cl @@ -126,7 +126,7 @@ DECLSPEC void m15000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) * salt */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; u32 salt_buf0[4]; @@ -138,22 +138,22 @@ DECLSPEC void m15000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf6[4]; u32 salt_buf7[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; salt_buf4[0] = 0x80; salt_buf4[1] = 0; salt_buf4[2] = 0; @@ -238,7 +238,7 @@ DECLSPEC void m15000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32x w0l = w0_t[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -287,17 +287,17 @@ DECLSPEC void m15000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * salt */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; u32 salt_buf0[4]; @@ -309,22 +309,22 @@ DECLSPEC void m15000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf6[4]; u32 salt_buf7[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; salt_buf4[0] = 0x80; salt_buf4[1] = 0; salt_buf4[2] = 0; @@ -409,7 +409,7 @@ DECLSPEC void m15000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32x w0l = w0_t[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -451,7 +451,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -478,7 +478,7 @@ KERNEL_FQ void m15000_m04 (KERN_ATTR_VECTOR ()) * main */ - m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15000_m08 (KERN_ATTR_VECTOR ()) @@ -489,7 +489,7 @@ KERNEL_FQ void m15000_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -516,7 +516,7 @@ KERNEL_FQ void m15000_m08 (KERN_ATTR_VECTOR ()) * main */ - m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15000_m16 (KERN_ATTR_VECTOR ()) @@ -527,7 +527,7 @@ KERNEL_FQ void m15000_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -554,7 +554,7 @@ KERNEL_FQ void m15000_m16 (KERN_ATTR_VECTOR ()) * main */ - m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15000_s04 (KERN_ATTR_VECTOR ()) @@ -565,7 +565,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -592,7 +592,7 @@ KERNEL_FQ void m15000_s04 (KERN_ATTR_VECTOR ()) * main */ - m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15000_s08 (KERN_ATTR_VECTOR ()) @@ -603,7 +603,7 @@ KERNEL_FQ void m15000_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -630,7 +630,7 @@ KERNEL_FQ void m15000_s08 (KERN_ATTR_VECTOR ()) * main */ - m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15000_s16 (KERN_ATTR_VECTOR ()) @@ -641,7 +641,7 @@ KERNEL_FQ void m15000_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -668,5 +668,5 @@ KERNEL_FQ void m15000_s16 (KERN_ATTR_VECTOR ()) * main */ - m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m15000_a3-pure.cl b/OpenCL/m15000_a3-pure.cl index 05233c5c3..76569c693 100644 --- a/OpenCL/m15000_a3-pure.cl +++ b/OpenCL/m15000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m15000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,7 +89,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -97,10 +97,10 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -116,13 +116,13 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -131,7 +131,7 @@ KERNEL_FQ void m15000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m15100-pure.cl b/OpenCL/m15100-pure.cl index c61e2e9d4..92a06ad7b 100644 --- a/OpenCL/m15100-pure.cl +++ b/OpenCL/m15100-pure.cl @@ -72,7 +72,7 @@ KERNEL_FQ void m15100_init (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -90,7 +90,7 @@ KERNEL_FQ void m15100_init (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf_pc, salt_bufs[SALT_POS].salt_len_pc); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf_pc, salt_bufs[SALT_POS_HOST].salt_len_pc); sha1_hmac_final (&sha1_hmac_ctx); @@ -105,7 +105,7 @@ KERNEL_FQ void m15100_loop (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -130,7 +130,7 @@ KERNEL_FQ void m15100_loop (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) out[3] = packv (tmps, out, gid, 3); out[4] = packv (tmps, out, gid, 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -172,7 +172,7 @@ KERNEL_FQ void m15100_comp (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m15300-pure.cl b/OpenCL/m15300-pure.cl index 5e59c5deb..3ad5a3f19 100644 --- a/OpenCL/m15300-pure.cl +++ b/OpenCL/m15300-pure.cl @@ -94,7 +94,7 @@ KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -102,7 +102,7 @@ KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) u32 digest_context[5]; - if (esalt_bufs[DIGESTS_OFFSET].context == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].context == 1) { /* local credentials */ @@ -120,7 +120,7 @@ KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) digest_context[3] = ctx.h[3]; digest_context[4] = ctx.h[4]; } - else if (esalt_bufs[DIGESTS_OFFSET].context == 2) + else if (esalt_bufs[DIGESTS_OFFSET_HOST].context == 2) { /* domain credentials */ @@ -172,7 +172,7 @@ KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].SID, esalt_bufs[DIGESTS_OFFSET].SID_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].SID, esalt_bufs[DIGESTS_OFFSET_HOST].SID_len); sha1_hmac_final (&ctx); @@ -225,10 +225,10 @@ KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - w0[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - w0[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - w0[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - w0[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + w0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + w0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + w0[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + w0[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; w1[0] = 0; w1[1] = 0; w1[2] = 0; @@ -291,7 +291,7 @@ KERNEL_FQ void m15300_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -325,7 +325,7 @@ KERNEL_FQ void m15300_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -417,7 +417,7 @@ KERNEL_FQ void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -474,41 +474,41 @@ KERNEL_FQ void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) u32 hmac_data[4]; - hmac_data[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[0]); - hmac_data[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[1]); - hmac_data[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[2]); - hmac_data[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[3]); + hmac_data[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[0]); + hmac_data[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[1]); + hmac_data[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[2]); + hmac_data[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[3]); u32 expected_key[4]; - expected_key[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[4]); - expected_key[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[5]); - expected_key[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[6]); - expected_key[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[7]); + expected_key[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[4]); + expected_key[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[5]); + expected_key[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[6]); + expected_key[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[7]); u32 last_iv[2]; - last_iv[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[8]); - last_iv[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[9]); + last_iv[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[8]); + last_iv[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[9]); u32 last_key[16]; - last_key[ 0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[10]); - last_key[ 1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[11]); - last_key[ 2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[12]); - last_key[ 3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[13]); - last_key[ 4] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[14]); - last_key[ 5] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[15]); - last_key[ 6] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[16]); - last_key[ 7] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[17]); - last_key[ 8] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[18]); - last_key[ 9] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[19]); - last_key[10] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[20]); - last_key[11] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[21]); - last_key[12] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[22]); - last_key[13] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[23]); - last_key[14] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[24]); - last_key[15] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].contents[25]); + last_key[ 0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[10]); + last_key[ 1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[11]); + last_key[ 2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[12]); + last_key[ 3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[13]); + last_key[ 4] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[14]); + last_key[ 5] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[15]); + last_key[ 6] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[16]); + last_key[ 7] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[17]); + last_key[ 8] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[18]); + last_key[ 9] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[19]); + last_key[10] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[20]); + last_key[11] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[21]); + last_key[12] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[22]); + last_key[13] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[23]); + last_key[14] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[24]); + last_key[15] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].contents[25]); // hmac_data @@ -676,9 +676,9 @@ KERNEL_FQ void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) && (expected_key[2] == hc_swap32_S (ctx.opad.h[2])) && (expected_key[3] == hc_swap32_S (ctx.opad.h[3]))) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m15400_a0-optimized.cl b/OpenCL/m15400_a0-optimized.cl index 4290303f1..c331f4480 100644 --- a/OpenCL/m15400_a0-optimized.cl +++ b/OpenCL/m15400_a0-optimized.cl @@ -248,7 +248,7 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -273,22 +273,22 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t)) u32 position[2] = { 0 }; u32 offset = 0; - position[0] = esalt_bufs[DIGESTS_OFFSET].position[0]; - position[1] = esalt_bufs[DIGESTS_OFFSET].position[1]; + position[0] = esalt_bufs[DIGESTS_OFFSET_HOST].position[0]; + position[1] = esalt_bufs[DIGESTS_OFFSET_HOST].position[1]; - offset = esalt_bufs[DIGESTS_OFFSET].offset; + offset = esalt_bufs[DIGESTS_OFFSET_HOST].offset; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; - plain[0] = esalt_bufs[DIGESTS_OFFSET].plain[0]; - plain[1] = esalt_bufs[DIGESTS_OFFSET].plain[1]; + plain[0] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[0]; + plain[1] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[1]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -326,7 +326,7 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -351,16 +351,16 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) u32 position[2] = { 0 }; u32 offset = 0; - position[0] = esalt_bufs[DIGESTS_OFFSET].position[0]; - position[1] = esalt_bufs[DIGESTS_OFFSET].position[1]; + position[0] = esalt_bufs[DIGESTS_OFFSET_HOST].position[0]; + position[1] = esalt_bufs[DIGESTS_OFFSET_HOST].position[1]; - offset = esalt_bufs[DIGESTS_OFFSET].offset; + offset = esalt_bufs[DIGESTS_OFFSET_HOST].offset; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; - plain[0] = esalt_bufs[DIGESTS_OFFSET].plain[0]; - plain[1] = esalt_bufs[DIGESTS_OFFSET].plain[1]; + plain[0] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[0]; + plain[1] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[1]; /** * digest @@ -368,17 +368,17 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m15400_a1-optimized.cl b/OpenCL/m15400_a1-optimized.cl index 886796b1b..2cae238e7 100644 --- a/OpenCL/m15400_a1-optimized.cl +++ b/OpenCL/m15400_a1-optimized.cl @@ -268,22 +268,22 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_ESALT (chacha20_t)) u32 position[2] = { 0 }; u32 offset = 0; - position[0] = esalt_bufs[DIGESTS_OFFSET].position[0]; - position[1] = esalt_bufs[DIGESTS_OFFSET].position[1]; + position[0] = esalt_bufs[DIGESTS_OFFSET_HOST].position[0]; + position[1] = esalt_bufs[DIGESTS_OFFSET_HOST].position[1]; - offset = esalt_bufs[DIGESTS_OFFSET].offset; + offset = esalt_bufs[DIGESTS_OFFSET_HOST].offset; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; - plain[0] = esalt_bufs[DIGESTS_OFFSET].plain[0]; - plain[1] = esalt_bufs[DIGESTS_OFFSET].plain[1]; + plain[0] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[0]; + plain[1] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[1]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -321,7 +321,7 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_ESALT (chacha20_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -373,7 +373,7 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -398,16 +398,16 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) u32 position[2] = { 0 }; u32 offset = 0; - position[0] = esalt_bufs[DIGESTS_OFFSET].position[0]; - position[1] = esalt_bufs[DIGESTS_OFFSET].position[1]; + position[0] = esalt_bufs[DIGESTS_OFFSET_HOST].position[0]; + position[1] = esalt_bufs[DIGESTS_OFFSET_HOST].position[1]; - offset = esalt_bufs[DIGESTS_OFFSET].offset; + offset = esalt_bufs[DIGESTS_OFFSET_HOST].offset; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; - plain[0] = esalt_bufs[DIGESTS_OFFSET].plain[0]; - plain[1] = esalt_bufs[DIGESTS_OFFSET].plain[1]; + plain[0] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[0]; + plain[1] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[1]; /** * digest @@ -415,17 +415,17 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -463,7 +463,7 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m15400_a3-optimized.cl b/OpenCL/m15400_a3-optimized.cl index 91f813a0a..e57a4ec7f 100644 --- a/OpenCL/m15400_a3-optimized.cl +++ b/OpenCL/m15400_a3-optimized.cl @@ -273,20 +273,20 @@ KERNEL_FQ void m15400_m16 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; u32 plain[2]; - plain[0] = esalt_bufs[DIGESTS_OFFSET].plain[0]; - plain[1] = esalt_bufs[DIGESTS_OFFSET].plain[1]; + plain[0] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[0]; + plain[1] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[1]; u32 position[2]; - position[0] = esalt_bufs[DIGESTS_OFFSET].position[0]; - position[1] = esalt_bufs[DIGESTS_OFFSET].position[1]; + position[0] = esalt_bufs[DIGESTS_OFFSET_HOST].position[0]; + position[1] = esalt_bufs[DIGESTS_OFFSET_HOST].position[1]; - u32 offset = esalt_bufs[DIGESTS_OFFSET].offset; + u32 offset = esalt_bufs[DIGESTS_OFFSET_HOST].offset; /** * loop @@ -294,7 +294,7 @@ KERNEL_FQ void m15400_m16 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) u32 w0l = pws[gid].i[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; const u32x w0x = w0l | w0r; @@ -361,20 +361,20 @@ KERNEL_FQ void m15400_s16 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; u32 plain[2]; - plain[0] = esalt_bufs[DIGESTS_OFFSET].plain[0]; - plain[1] = esalt_bufs[DIGESTS_OFFSET].plain[1]; + plain[0] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[0]; + plain[1] = esalt_bufs[DIGESTS_OFFSET_HOST].plain[1]; u32 position[2]; - position[0] = esalt_bufs[DIGESTS_OFFSET].position[0]; - position[1] = esalt_bufs[DIGESTS_OFFSET].position[1]; + position[0] = esalt_bufs[DIGESTS_OFFSET_HOST].position[0]; + position[1] = esalt_bufs[DIGESTS_OFFSET_HOST].position[1]; - u32 offset = esalt_bufs[DIGESTS_OFFSET].offset; + u32 offset = esalt_bufs[DIGESTS_OFFSET_HOST].offset; /** * digest @@ -382,10 +382,10 @@ KERNEL_FQ void m15400_s16 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -394,7 +394,7 @@ KERNEL_FQ void m15400_s16 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) u32 w0l = pws[gid].i[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; const u32x w0x = w0l | w0r; diff --git a/OpenCL/m15500_a0-optimized.cl b/OpenCL/m15500_a0-optimized.cl index 2c28cc08d..5812bd89d 100644 --- a/OpenCL/m15500_a0-optimized.cl +++ b/OpenCL/m15500_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -52,11 +52,11 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_RULES ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; const u32 salt_len = 20; @@ -64,7 +64,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -286,7 +286,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -308,11 +308,11 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_RULES ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; const u32 salt_len = 20; @@ -322,17 +322,17 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m15500_a0-pure.cl b/OpenCL/m15500_a0-pure.cl index 8bbff81f1..cca5eeb6d 100644 --- a/OpenCL/m15500_a0-pure.cl +++ b/OpenCL/m15500_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,20 +33,20 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -86,7 +86,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -94,10 +94,10 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -106,20 +106,20 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m15500_a1-optimized.cl b/OpenCL/m15500_a1-optimized.cl index 8ccd52a35..8bf457d3b 100644 --- a/OpenCL/m15500_a1-optimized.cl +++ b/OpenCL/m15500_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,11 +50,11 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_BASIC ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; const u32 salt_len = 20; @@ -62,7 +62,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -100,7 +100,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -344,7 +344,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -366,11 +366,11 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_BASIC ()) u32 salt_buf[5]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf[4] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf[4] = salt_bufs[SALT_POS_HOST].salt_buf[4]; const u32 salt_len = 20; @@ -380,17 +380,17 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -428,7 +428,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m15500_a1-pure.cl b/OpenCL/m15500_a1-pure.cl index 09650d0ba..6f2ee30da 100644 --- a/OpenCL/m15500_a1-pure.cl +++ b/OpenCL/m15500_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -48,7 +48,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -82,7 +82,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -90,23 +90,23 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; @@ -119,7 +119,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m15500_a3-optimized.cl b/OpenCL/m15500_a3-optimized.cl index 1882bbf8f..25d649d32 100644 --- a/OpenCL/m15500_a3-optimized.cl +++ b/OpenCL/m15500_a3-optimized.cl @@ -32,11 +32,11 @@ DECLSPEC void m15500m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[4]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; salt_buf1[1] = 0x80; salt_buf1[2] = 0; salt_buf1[3] = 0; @@ -68,7 +68,7 @@ DECLSPEC void m15500m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) w[14] |= hc_swap32_S (salt_buf3[2]); w[15] |= hc_swap32_S (salt_buf3[3]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -165,7 +165,7 @@ DECLSPEC void m15500m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -414,10 +414,10 @@ DECLSPEC void m15500s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -426,7 +426,7 @@ DECLSPEC void m15500s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -594,7 +594,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -621,7 +621,7 @@ KERNEL_FQ void m15500_m04 (KERN_ATTR_VECTOR ()) * main */ - m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15500_m08 (KERN_ATTR_VECTOR ()) @@ -632,7 +632,7 @@ KERNEL_FQ void m15500_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -659,7 +659,7 @@ KERNEL_FQ void m15500_m08 (KERN_ATTR_VECTOR ()) * main */ - m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15500_m16 (KERN_ATTR_VECTOR ()) @@ -670,7 +670,7 @@ KERNEL_FQ void m15500_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -697,7 +697,7 @@ KERNEL_FQ void m15500_m16 (KERN_ATTR_VECTOR ()) * main */ - m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15500_s04 (KERN_ATTR_VECTOR ()) @@ -708,7 +708,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -735,7 +735,7 @@ KERNEL_FQ void m15500_s04 (KERN_ATTR_VECTOR ()) * main */ - m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15500_s08 (KERN_ATTR_VECTOR ()) @@ -746,7 +746,7 @@ KERNEL_FQ void m15500_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -773,7 +773,7 @@ KERNEL_FQ void m15500_s08 (KERN_ATTR_VECTOR ()) * main */ - m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m15500_s16 (KERN_ATTR_VECTOR ()) @@ -784,7 +784,7 @@ KERNEL_FQ void m15500_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -811,5 +811,5 @@ KERNEL_FQ void m15500_s16 (KERN_ATTR_VECTOR ()) * main */ - m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m15500_a3-pure.cl b/OpenCL/m15500_a3-pure.cl index c3a2eff43..2208f90d0 100644 --- a/OpenCL/m15500_a3-pure.cl +++ b/OpenCL/m15500_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,13 +38,13 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m15500_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -95,7 +95,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -122,13 +122,13 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -137,7 +137,7 @@ KERNEL_FQ void m15500_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m15600-pure.cl b/OpenCL/m15600-pure.cl index 71eb48bfc..415df1e73 100644 --- a/OpenCL/m15600-pure.cl +++ b/OpenCL/m15600-pure.cl @@ -213,7 +213,7 @@ KERNEL_FQ void m15600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -237,7 +237,7 @@ KERNEL_FQ void m15600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -293,7 +293,7 @@ KERNEL_FQ void m15600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -339,7 +339,7 @@ KERNEL_FQ void m15600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -403,7 +403,7 @@ KERNEL_FQ void m15600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -413,14 +413,14 @@ KERNEL_FQ void m15600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ u32 ciphertext[8]; - ciphertext[0] = esalt_bufs[DIGESTS_OFFSET].ciphertext[0]; - ciphertext[1] = esalt_bufs[DIGESTS_OFFSET].ciphertext[1]; - ciphertext[2] = esalt_bufs[DIGESTS_OFFSET].ciphertext[2]; - ciphertext[3] = esalt_bufs[DIGESTS_OFFSET].ciphertext[3]; - ciphertext[4] = esalt_bufs[DIGESTS_OFFSET].ciphertext[4]; - ciphertext[5] = esalt_bufs[DIGESTS_OFFSET].ciphertext[5]; - ciphertext[6] = esalt_bufs[DIGESTS_OFFSET].ciphertext[6]; - ciphertext[7] = esalt_bufs[DIGESTS_OFFSET].ciphertext[7]; + ciphertext[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[0]; + ciphertext[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[1]; + ciphertext[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[2]; + ciphertext[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[3]; + ciphertext[4] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[4]; + ciphertext[5] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[5]; + ciphertext[6] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[6]; + ciphertext[7] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[7]; u32 key[4]; diff --git a/OpenCL/m15700-pure.cl b/OpenCL/m15700-pure.cl index 09819b085..1d75081d3 100644 --- a/OpenCL/m15700-pure.cl +++ b/OpenCL/m15700-pure.cl @@ -390,13 +390,13 @@ KERNEL_FQ void m15700_init (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; sha256_hmac_init_global_swap (&sha256_hmac_ctx, pws[gid].i, pws[gid].pw_len); - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1, k = 0; i < SCRYPT_CNT; i += 8, j += 1, k += 2) { @@ -495,7 +495,7 @@ KERNEL_FQ void m15700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // SCRYPT part, init V @@ -506,7 +506,7 @@ KERNEL_FQ void m15700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -522,7 +522,7 @@ KERNEL_FQ void m15700_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf; GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf; @@ -531,7 +531,7 @@ KERNEL_FQ void m15700_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -551,7 +551,7 @@ KERNEL_FQ void m15700_comp (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_ const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * 2nd pbkdf2, creates B @@ -641,14 +641,14 @@ KERNEL_FQ void m15700_comp (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_ u32 ciphertext[8]; - ciphertext[0] = esalt_bufs[DIGESTS_OFFSET].ciphertext[0]; - ciphertext[1] = esalt_bufs[DIGESTS_OFFSET].ciphertext[1]; - ciphertext[2] = esalt_bufs[DIGESTS_OFFSET].ciphertext[2]; - ciphertext[3] = esalt_bufs[DIGESTS_OFFSET].ciphertext[3]; - ciphertext[4] = esalt_bufs[DIGESTS_OFFSET].ciphertext[4]; - ciphertext[5] = esalt_bufs[DIGESTS_OFFSET].ciphertext[5]; - ciphertext[6] = esalt_bufs[DIGESTS_OFFSET].ciphertext[6]; - ciphertext[7] = esalt_bufs[DIGESTS_OFFSET].ciphertext[7]; + ciphertext[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[0]; + ciphertext[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[1]; + ciphertext[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[2]; + ciphertext[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[3]; + ciphertext[4] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[4]; + ciphertext[5] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[5]; + ciphertext[6] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[6]; + ciphertext[7] = esalt_bufs[DIGESTS_OFFSET_HOST].ciphertext[7]; u32 key[4]; diff --git a/OpenCL/m15900-pure.cl b/OpenCL/m15900-pure.cl index 78caf5fd7..db6d9dab6 100644 --- a/OpenCL/m15900-pure.cl +++ b/OpenCL/m15900-pure.cl @@ -117,7 +117,7 @@ KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -125,7 +125,7 @@ KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) u32 digest_context[5]; - if (esalt_bufs[DIGESTS_OFFSET].context == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].context == 1) { /* local credentials */ @@ -143,7 +143,7 @@ KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) digest_context[3] = ctx.h[3]; digest_context[4] = ctx.h[4]; } - else if (esalt_bufs[DIGESTS_OFFSET].context == 2) + else if (esalt_bufs[DIGESTS_OFFSET_HOST].context == 2) { /* domain credentials */ @@ -195,7 +195,7 @@ KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) sha1_hmac_init_64 (&ctx, w0, w1, w2, w3); - sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].SID, esalt_bufs[DIGESTS_OFFSET].SID_len); + sha1_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].SID, esalt_bufs[DIGESTS_OFFSET_HOST].SID_len); sha1_hmac_final (&ctx); @@ -275,10 +275,10 @@ KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) tmps[gid].opad64[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad64[7] = sha512_hmac_ctx.opad.h[7]; - w0[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - w0[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - w0[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - w0[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + w0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + w0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + w0[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + w0[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; w1[0] = 0; w1[1] = 0; w1[2] = 0; @@ -379,7 +379,7 @@ KERNEL_FQ void m15900_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -425,7 +425,7 @@ KERNEL_FQ void m15900_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) out[6] = pack64v (tmps, out64, gid, i + 6); out[7] = pack64v (tmps, out64, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -558,7 +558,7 @@ KERNEL_FQ void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -603,43 +603,43 @@ KERNEL_FQ void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) u32 hmac_data[4]; - hmac_data[0] = esalt_bufs[DIGESTS_OFFSET].contents[0]; - hmac_data[1] = esalt_bufs[DIGESTS_OFFSET].contents[1]; - hmac_data[2] = esalt_bufs[DIGESTS_OFFSET].contents[2]; - hmac_data[3] = esalt_bufs[DIGESTS_OFFSET].contents[3]; + hmac_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[0]; + hmac_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[1]; + hmac_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[2]; + hmac_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[3]; u32 expected_key[4]; - expected_key[0] = esalt_bufs[DIGESTS_OFFSET].contents[4]; - expected_key[1] = esalt_bufs[DIGESTS_OFFSET].contents[5]; - expected_key[2] = esalt_bufs[DIGESTS_OFFSET].contents[6]; - expected_key[3] = esalt_bufs[DIGESTS_OFFSET].contents[7]; + expected_key[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[4]; + expected_key[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[5]; + expected_key[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[6]; + expected_key[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[7]; u32 last_iv[4]; - last_iv[0] = esalt_bufs[DIGESTS_OFFSET].contents[16]; - last_iv[1] = esalt_bufs[DIGESTS_OFFSET].contents[17]; - last_iv[2] = esalt_bufs[DIGESTS_OFFSET].contents[18]; - last_iv[3] = esalt_bufs[DIGESTS_OFFSET].contents[19]; + last_iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[16]; + last_iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[17]; + last_iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[18]; + last_iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[19]; u32 last_key[16]; - last_key[ 0] = esalt_bufs[DIGESTS_OFFSET].contents[20]; - last_key[ 1] = esalt_bufs[DIGESTS_OFFSET].contents[21]; - last_key[ 2] = esalt_bufs[DIGESTS_OFFSET].contents[22]; - last_key[ 3] = esalt_bufs[DIGESTS_OFFSET].contents[23]; - last_key[ 4] = esalt_bufs[DIGESTS_OFFSET].contents[24]; - last_key[ 5] = esalt_bufs[DIGESTS_OFFSET].contents[25]; - last_key[ 6] = esalt_bufs[DIGESTS_OFFSET].contents[26]; - last_key[ 7] = esalt_bufs[DIGESTS_OFFSET].contents[27]; - last_key[ 8] = esalt_bufs[DIGESTS_OFFSET].contents[28]; - last_key[ 9] = esalt_bufs[DIGESTS_OFFSET].contents[29]; - last_key[10] = esalt_bufs[DIGESTS_OFFSET].contents[30]; - last_key[11] = esalt_bufs[DIGESTS_OFFSET].contents[31]; - last_key[12] = esalt_bufs[DIGESTS_OFFSET].contents[32]; - last_key[13] = esalt_bufs[DIGESTS_OFFSET].contents[33]; - last_key[14] = esalt_bufs[DIGESTS_OFFSET].contents[34]; - last_key[15] = esalt_bufs[DIGESTS_OFFSET].contents[35]; + last_key[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[20]; + last_key[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[21]; + last_key[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[22]; + last_key[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[23]; + last_key[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[24]; + last_key[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[25]; + last_key[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[26]; + last_key[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[27]; + last_key[ 8] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[28]; + last_key[ 9] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[29]; + last_key[10] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[30]; + last_key[11] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[31]; + last_key[12] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[32]; + last_key[13] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[33]; + last_key[14] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[34]; + last_key[15] = esalt_bufs[DIGESTS_OFFSET_HOST].contents[35]; // hmac_data @@ -859,9 +859,9 @@ KERNEL_FQ void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) && (expected_key[2] == h32_from_64_S (ctx.opad.h[1])) && (expected_key[3] == l32_from_64_S (ctx.opad.h[1]))) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16000_a0-pure.cl b/OpenCL/m16000_a0-pure.cl index 25ffe8c9e..7725951cf 100644 --- a/OpenCL/m16000_a0-pure.cl +++ b/OpenCL/m16000_a0-pure.cl @@ -541,7 +541,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -553,7 +553,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_RULES ()) * main */ - 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) { pw_t tmp = PASTE_PW; @@ -634,7 +634,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -648,8 +648,8 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -658,7 +658,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_RULES ()) * main */ - 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) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m16000_a1-pure.cl b/OpenCL/m16000_a1-pure.cl index e7d51e68d..2dc8d104e 100644 --- a/OpenCL/m16000_a1-pure.cl +++ b/OpenCL/m16000_a1-pure.cl @@ -539,7 +539,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -563,7 +563,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -601,7 +601,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -711,7 +711,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -737,8 +737,8 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -747,7 +747,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -785,7 +785,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m16000_a3-pure.cl b/OpenCL/m16000_a3-pure.cl index d140efba4..769e4fed9 100644 --- a/OpenCL/m16000_a3-pure.cl +++ b/OpenCL/m16000_a3-pure.cl @@ -539,7 +539,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -572,7 +572,7 @@ KERNEL_FQ void m16000_mxx (KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -660,7 +660,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -693,8 +693,8 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -705,7 +705,7 @@ KERNEL_FQ void m16000_sxx (KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m16100_a0-optimized.cl b/OpenCL/m16100_a0-optimized.cl index 6fd679154..9b89a3883 100644 --- a/OpenCL/m16100_a0-optimized.cl +++ b/OpenCL/m16100_a0-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,25 +61,25 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) * salt */ - const u32 session_buf = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; - const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + const u32 session_buf = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; + const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * digest */ - const u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + const u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -258,9 +258,9 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -276,9 +276,9 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -295,9 +295,9 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -326,7 +326,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -346,25 +346,25 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) * salt */ - const u32 session_buf = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; - const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + const u32 session_buf = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; + const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * digest */ - const u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + const u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -543,9 +543,9 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -561,9 +561,9 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -580,9 +580,9 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16100_a0-pure.cl b/OpenCL/m16100_a0-pure.cl index 1bb0cda09..f5f6a3a5c 100644 --- a/OpenCL/m16100_a0-pure.cl +++ b/OpenCL/m16100_a0-pure.cl @@ -36,7 +36,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -53,7 +53,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) u32 session2[4]; u32 session3[4]; - session0[0] = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; + session0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; session0[1] = 0; session0[2] = 0; session0[3] = 0; @@ -74,18 +74,18 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; - u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; - u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -143,9 +143,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -161,9 +161,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -180,9 +180,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -198,7 +198,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -215,7 +215,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) u32 session2[4]; u32 session3[4]; - session0[0] = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; + session0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; session0[1] = 0; session0[2] = 0; session0[3] = 0; @@ -236,18 +236,18 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; - u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; - u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -305,9 +305,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -323,9 +323,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -342,9 +342,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16100_a1-optimized.cl b/OpenCL/m16100_a1-optimized.cl index 826992386..e9ed7138b 100644 --- a/OpenCL/m16100_a1-optimized.cl +++ b/OpenCL/m16100_a1-optimized.cl @@ -39,7 +39,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -59,25 +59,25 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) * salt */ - const u32 session_buf = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; - const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + const u32 session_buf = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; + const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * digest */ - const u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + const u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -115,7 +115,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -317,9 +317,9 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -335,9 +335,9 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -354,9 +354,9 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -385,7 +385,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -405,25 +405,25 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) * salt */ - const u32 session_buf = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; - const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + const u32 session_buf = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; + const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * digest */ - const u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + const u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -461,7 +461,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -663,9 +663,9 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -681,9 +681,9 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -700,9 +700,9 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16100_a1-pure.cl b/OpenCL/m16100_a1-pure.cl index 90415e54d..95525c7b9 100644 --- a/OpenCL/m16100_a1-pure.cl +++ b/OpenCL/m16100_a1-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -48,7 +48,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) u32 session2[4]; u32 session3[4]; - session0[0] = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; + session0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; session0[1] = 0; session0[2] = 0; session0[3] = 0; @@ -71,18 +71,18 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; - u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; - u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -136,9 +136,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -154,9 +154,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -173,9 +173,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -191,7 +191,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -206,7 +206,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) u32 session2[4]; u32 session3[4]; - session0[0] = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; + session0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; session0[1] = 0; session0[2] = 0; session0[3] = 0; @@ -229,18 +229,18 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; - u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; - u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -294,9 +294,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -312,9 +312,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -331,9 +331,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16100_a3-optimized.cl b/OpenCL/m16100_a3-optimized.cl index fb65e0f52..ee6ce37c9 100644 --- a/OpenCL/m16100_a3-optimized.cl +++ b/OpenCL/m16100_a3-optimized.cl @@ -38,19 +38,19 @@ DECLSPEC void m16100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * digest */ - const u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + const u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; /** * salt */ - const u32 session_buf = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; - const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + const u32 session_buf = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; + const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; const u32 pw_salt_len = 4 + pw_len + 2; @@ -84,7 +84,7 @@ DECLSPEC void m16100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -232,9 +232,9 @@ DECLSPEC void m16100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -250,9 +250,9 @@ DECLSPEC void m16100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -269,9 +269,9 @@ DECLSPEC void m16100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -291,19 +291,19 @@ DECLSPEC void m16100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER * digest */ - const u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + const u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; /** * salt */ - const u32 session_buf = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; - const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + const u32 session_buf = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; + const u32 sequence_buf = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; const u32 pw_salt_len = 4 + pw_len + 2; @@ -337,7 +337,7 @@ DECLSPEC void m16100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -485,9 +485,9 @@ DECLSPEC void m16100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -503,9 +503,9 @@ DECLSPEC void m16100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -522,9 +522,9 @@ DECLSPEC void m16100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -539,7 +539,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -575,7 +575,7 @@ KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) * main */ - m16100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) @@ -586,7 +586,7 @@ KERNEL_FQ void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -622,7 +622,7 @@ KERNEL_FQ void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) * main */ - m16100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) @@ -633,7 +633,7 @@ KERNEL_FQ void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -669,7 +669,7 @@ KERNEL_FQ void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) * main */ - m16100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) @@ -680,7 +680,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -716,7 +716,7 @@ KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) * main */ - m16100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) @@ -727,7 +727,7 @@ KERNEL_FQ void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -763,7 +763,7 @@ KERNEL_FQ void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) * main */ - m16100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) @@ -774,7 +774,7 @@ KERNEL_FQ void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -810,5 +810,5 @@ KERNEL_FQ void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) * main */ - m16100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m16100_a3-pure.cl b/OpenCL/m16100_a3-pure.cl index 634f05528..f7cbb0bd4 100644 --- a/OpenCL/m16100_a3-pure.cl +++ b/OpenCL/m16100_a3-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -57,7 +57,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) u32 session2[4]; u32 session3[4]; - session0[0] = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; + session0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; session0[1] = 0; session0[2] = 0; session0[3] = 0; @@ -78,12 +78,12 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; - u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; - u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * loop @@ -91,7 +91,7 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -153,9 +153,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -171,9 +171,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -190,9 +190,9 @@ KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -208,7 +208,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -232,7 +232,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) u32 session2[4]; u32 session3[4]; - session0[0] = esalt_bufs[DIGESTS_OFFSET].session_buf[0]; + session0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].session_buf[0]; session0[1] = 0; session0[2] = 0; session0[3] = 0; @@ -253,12 +253,12 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) u32 ct_buf[2]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_data_buf[1]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf[1]; - u32 ct_len = esalt_bufs[DIGESTS_OFFSET].ct_data_len; + u32 ct_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len; - u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET].sequence_buf[0]; + u32 sequence_buf0 = esalt_bufs[DIGESTS_OFFSET_HOST].sequence_buf[0]; /** * loop @@ -266,7 +266,7 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -328,9 +328,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) && ((authen_service >= 0x00) && (authen_service <= 0x09)) && ((8 + user_len + port_len + rem_addr_len + data_len) == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -346,9 +346,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) && (data_len == 0) && (flags == 0)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -365,9 +365,9 @@ KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) && (flags == 0x01 || flags == 0x00) && (6 + msg_len + data_len == ct_len)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16200-pure.cl b/OpenCL/m16200-pure.cl index fb842e566..891f0a432 100644 --- a/OpenCL/m16200-pure.cl +++ b/OpenCL/m16200-pure.cl @@ -87,7 +87,7 @@ KERNEL_FQ void m16200_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -111,7 +111,7 @@ KERNEL_FQ void m16200_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].ZCRYPTOSALT, 16); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOSALT, 16); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -167,7 +167,7 @@ KERNEL_FQ void m16200_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -213,7 +213,7 @@ KERNEL_FQ void m16200_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -326,7 +326,7 @@ KERNEL_FQ void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[4]; @@ -347,12 +347,12 @@ KERNEL_FQ void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl u32 P1[2]; u32 P2[2]; - A[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[0]); - A[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[1]); - P1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[2]); - P1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[3]); - P2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[4]); - P2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[5]); + A[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[0]); + A[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[1]); + P1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[2]); + P1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[3]); + P2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[4]); + P2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[5]); for (int j = 5; j >= 0; j--) { @@ -394,9 +394,9 @@ KERNEL_FQ void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl if ((A[0] == 0xa6a6a6a6) && (A[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m16300-pure.cl b/OpenCL/m16300-pure.cl index 93bad060f..007e4e560 100644 --- a/OpenCL/m16300-pure.cl +++ b/OpenCL/m16300-pure.cl @@ -215,7 +215,7 @@ KERNEL_FQ void m16300_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -295,7 +295,7 @@ KERNEL_FQ void m16300_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -341,7 +341,7 @@ KERNEL_FQ void m16300_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -458,7 +458,7 @@ KERNEL_FQ void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* * AES-CBC-128 decrypt @@ -487,17 +487,17 @@ KERNEL_FQ void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; u32 a = iv[0]; u32 b = iv[1]; u32 c = iv[2]; u32 d = iv[3]; - u32 enc_seed_len = esalt_bufs[DIGESTS_OFFSET].enc_seed_len; + u32 enc_seed_len = esalt_bufs[DIGESTS_OFFSET_HOST].enc_seed_len; u64 seed[76 + 1]; // we need the + 1 to add the final \x02 @@ -508,10 +508,10 @@ KERNEL_FQ void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_ { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].enc_seed[loop_idx + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].enc_seed[loop_idx + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].enc_seed[loop_idx + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].enc_seed[loop_idx + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_seed[loop_idx + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_seed[loop_idx + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_seed[loop_idx + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_seed[loop_idx + 3]; u32 out[4]; diff --git a/OpenCL/m16400_a0-optimized.cl b/OpenCL/m16400_a0-optimized.cl index 9047e90f3..f1928fcd8 100644 --- a/OpenCL/m16400_a0-optimized.cl +++ b/OpenCL/m16400_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -177,7 +177,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -199,17 +199,17 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m16400_a0-pure.cl b/OpenCL/m16400_a0-pure.cl index 2bdf16a7f..7c7896d6f 100644 --- a/OpenCL/m16400_a0-pure.cl +++ b/OpenCL/m16400_a0-pure.cl @@ -185,7 +185,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -197,7 +197,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -229,7 +229,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -237,10 +237,10 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -253,7 +253,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m16400_a1-optimized.cl b/OpenCL/m16400_a1-optimized.cl index 2d7fdf9d3..e445077a5 100644 --- a/OpenCL/m16400_a1-optimized.cl +++ b/OpenCL/m16400_a1-optimized.cl @@ -29,7 +29,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -49,7 +49,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -87,7 +87,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -223,7 +223,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -245,17 +245,17 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -293,7 +293,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m16400_a1-pure.cl b/OpenCL/m16400_a1-pure.cl index 0953452d2..655047b14 100644 --- a/OpenCL/m16400_a1-pure.cl +++ b/OpenCL/m16400_a1-pure.cl @@ -183,7 +183,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -199,7 +199,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; @@ -225,7 +225,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -233,10 +233,10 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -253,7 +253,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx = ctx0; diff --git a/OpenCL/m16400_a3-optimized.cl b/OpenCL/m16400_a3-optimized.cl index 2e6cb5041..0106b37da 100644 --- a/OpenCL/m16400_a3-optimized.cl +++ b/OpenCL/m16400_a3-optimized.cl @@ -138,7 +138,7 @@ DECLSPEC void m16400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -330,20 +330,20 @@ DECLSPEC void m16400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; MD5_STEP_REV (MD5_I_S, b_rev, c_rev, d_rev, a_rev, w[ 9], MD5C3f, MD5S33); MD5_STEP_REV (MD5_I_S, c_rev, d_rev, a_rev, b_rev, w[ 2], MD5C3e, MD5S32); @@ -373,7 +373,7 @@ DECLSPEC void m16400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -477,7 +477,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -504,7 +504,7 @@ KERNEL_FQ void m16400_m04 (KERN_ATTR_VECTOR ()) * main */ - m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16400_m08 (KERN_ATTR_VECTOR ()) @@ -515,7 +515,7 @@ KERNEL_FQ void m16400_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -542,7 +542,7 @@ KERNEL_FQ void m16400_m08 (KERN_ATTR_VECTOR ()) * main */ - m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16400_m16 (KERN_ATTR_VECTOR ()) @@ -553,7 +553,7 @@ KERNEL_FQ void m16400_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -580,7 +580,7 @@ KERNEL_FQ void m16400_m16 (KERN_ATTR_VECTOR ()) * main */ - m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16400_s04 (KERN_ATTR_VECTOR ()) @@ -591,7 +591,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -618,7 +618,7 @@ KERNEL_FQ void m16400_s04 (KERN_ATTR_VECTOR ()) * main */ - m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16400_s08 (KERN_ATTR_VECTOR ()) @@ -629,7 +629,7 @@ KERNEL_FQ void m16400_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -656,7 +656,7 @@ KERNEL_FQ void m16400_s08 (KERN_ATTR_VECTOR ()) * main */ - m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16400_s16 (KERN_ATTR_VECTOR ()) @@ -667,7 +667,7 @@ KERNEL_FQ void m16400_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -694,5 +694,5 @@ KERNEL_FQ void m16400_s16 (KERN_ATTR_VECTOR ()) * main */ - m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m16400_a3-pure.cl b/OpenCL/m16400_a3-pure.cl index 22b6d422c..015fef21c 100644 --- a/OpenCL/m16400_a3-pure.cl +++ b/OpenCL/m16400_a3-pure.cl @@ -184,7 +184,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -205,7 +205,7 @@ KERNEL_FQ void m16400_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -239,7 +239,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -247,10 +247,10 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -272,7 +272,7 @@ KERNEL_FQ void m16400_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m16511_a0-pure.cl b/OpenCL/m16511_a0-pure.cl index 0eb31f9b7..5b7f9ca65 100644 --- a/OpenCL/m16511_a0-pure.cl +++ b/OpenCL/m16511_a0-pure.cl @@ -34,7 +34,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -46,7 +46,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -56,7 +56,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) sha256_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&ctx); @@ -78,7 +78,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -102,7 +102,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -112,7 +112,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) sha256_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&ctx); diff --git a/OpenCL/m16511_a1-pure.cl b/OpenCL/m16511_a1-pure.cl index 504ece0ac..b4538c6d5 100644 --- a/OpenCL/m16511_a1-pure.cl +++ b/OpenCL/m16511_a1-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -51,7 +51,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -79,7 +79,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) sha256_hmac_init (&ctx, c, pw_len + comb_len); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&ctx); @@ -101,7 +101,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -132,7 +132,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -160,7 +160,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) sha256_hmac_init (&ctx, c, pw_len + comb_len); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&ctx); diff --git a/OpenCL/m16511_a3-pure.cl b/OpenCL/m16511_a3-pure.cl index fc9302f59..860f01b3a 100644 --- a/OpenCL/m16511_a3-pure.cl +++ b/OpenCL/m16511_a3-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -53,7 +53,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -65,7 +65,7 @@ KERNEL_FQ void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) sha256_hmac_init (&ctx, w, pw_len); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&ctx); @@ -87,7 +87,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -120,7 +120,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -132,7 +132,7 @@ KERNEL_FQ void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) sha256_hmac_init (&ctx, w, pw_len); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&ctx); diff --git a/OpenCL/m16512_a0-pure.cl b/OpenCL/m16512_a0-pure.cl index 8651383bd..4ea19e8e3 100644 --- a/OpenCL/m16512_a0-pure.cl +++ b/OpenCL/m16512_a0-pure.cl @@ -34,7 +34,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -46,7 +46,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -56,7 +56,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) sha384_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&ctx); @@ -78,7 +78,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -102,7 +102,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -112,7 +112,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) sha384_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&ctx); diff --git a/OpenCL/m16512_a1-pure.cl b/OpenCL/m16512_a1-pure.cl index b62c59f14..f3509783b 100644 --- a/OpenCL/m16512_a1-pure.cl +++ b/OpenCL/m16512_a1-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -51,7 +51,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -79,7 +79,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) sha384_hmac_init (&ctx, c, pw_len + comb_len); - sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&ctx); @@ -101,7 +101,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -132,7 +132,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -160,7 +160,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) sha384_hmac_init (&ctx, c, pw_len + comb_len); - sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&ctx); diff --git a/OpenCL/m16512_a3-pure.cl b/OpenCL/m16512_a3-pure.cl index 6fdcc2e79..e4fa094f1 100644 --- a/OpenCL/m16512_a3-pure.cl +++ b/OpenCL/m16512_a3-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -53,7 +53,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -65,7 +65,7 @@ KERNEL_FQ void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) sha384_hmac_init (&ctx, w, pw_len); - sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&ctx); @@ -87,7 +87,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -120,7 +120,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -132,7 +132,7 @@ KERNEL_FQ void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) sha384_hmac_init (&ctx, w, pw_len); - sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&ctx); diff --git a/OpenCL/m16513_a0-pure.cl b/OpenCL/m16513_a0-pure.cl index ad423e1dd..50b9d0054 100644 --- a/OpenCL/m16513_a0-pure.cl +++ b/OpenCL/m16513_a0-pure.cl @@ -34,7 +34,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -46,7 +46,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -56,7 +56,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) sha512_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&ctx); @@ -78,7 +78,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,10 +86,10 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -102,7 +102,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -112,7 +112,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) sha512_hmac_init_swap (&ctx, tmp.i, tmp.pw_len); - sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&ctx); diff --git a/OpenCL/m16513_a1-pure.cl b/OpenCL/m16513_a1-pure.cl index 6e9e017c5..14d729af0 100644 --- a/OpenCL/m16513_a1-pure.cl +++ b/OpenCL/m16513_a1-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -51,7 +51,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -79,7 +79,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) sha512_hmac_init (&ctx, c, pw_len + comb_len); - sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&ctx); @@ -101,7 +101,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -132,7 +132,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -160,7 +160,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) sha512_hmac_init (&ctx, c, pw_len + comb_len); - sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&ctx); diff --git a/OpenCL/m16513_a3-pure.cl b/OpenCL/m16513_a3-pure.cl index 446fce280..166b55ec7 100644 --- a/OpenCL/m16513_a3-pure.cl +++ b/OpenCL/m16513_a3-pure.cl @@ -32,7 +32,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -53,7 +53,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -65,7 +65,7 @@ KERNEL_FQ void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) sha512_hmac_init (&ctx, w, pw_len); - sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&ctx); @@ -87,7 +87,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -95,10 +95,10 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -120,7 +120,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -132,7 +132,7 @@ KERNEL_FQ void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) sha512_hmac_init (&ctx, w, pw_len); - sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&ctx); diff --git a/OpenCL/m16600_a0-optimized.cl b/OpenCL/m16600_a0-optimized.cl index 7a69a1212..7fd8e6ea7 100644 --- a/OpenCL/m16600_a0-optimized.cl +++ b/OpenCL/m16600_a0-optimized.cl @@ -86,7 +86,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -110,27 +110,27 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -384,9 +384,9 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -400,9 +400,9 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -412,17 +412,17 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -498,7 +498,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -522,27 +522,27 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -796,9 +796,9 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -812,9 +812,9 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -824,17 +824,17 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16600_a0-pure.cl b/OpenCL/m16600_a0-pure.cl index 5d4ca64f5..7ac22f3b7 100644 --- a/OpenCL/m16600_a0-pure.cl +++ b/OpenCL/m16600_a0-pure.cl @@ -86,7 +86,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -98,27 +98,27 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -198,9 +198,9 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -214,9 +214,9 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -226,17 +226,17 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -304,7 +304,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -316,27 +316,27 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -416,9 +416,9 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -432,9 +432,9 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -444,17 +444,17 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16600_a1-optimized.cl b/OpenCL/m16600_a1-optimized.cl index 150c6be9f..6511dd687 100644 --- a/OpenCL/m16600_a1-optimized.cl +++ b/OpenCL/m16600_a1-optimized.cl @@ -84,7 +84,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -108,27 +108,27 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -166,7 +166,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -440,9 +440,9 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -456,9 +456,9 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -468,17 +468,17 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -554,7 +554,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -578,27 +578,27 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -636,7 +636,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -910,9 +910,9 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -926,9 +926,9 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -938,17 +938,17 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16600_a1-pure.cl b/OpenCL/m16600_a1-pure.cl index 841535295..d91fb852f 100644 --- a/OpenCL/m16600_a1-pure.cl +++ b/OpenCL/m16600_a1-pure.cl @@ -84,7 +84,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -100,27 +100,27 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -194,9 +194,9 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -210,9 +210,9 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -222,17 +222,17 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -300,7 +300,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -316,27 +316,27 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -410,9 +410,9 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -426,9 +426,9 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -438,17 +438,17 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16600_a3-optimized.cl b/OpenCL/m16600_a3-optimized.cl index e2ebdf2e9..a9972ded5 100644 --- a/OpenCL/m16600_a3-optimized.cl +++ b/OpenCL/m16600_a3-optimized.cl @@ -35,21 +35,21 @@ DECLSPEC void m16600 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop @@ -57,7 +57,7 @@ DECLSPEC void m16600 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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); @@ -161,9 +161,9 @@ DECLSPEC void m16600 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -177,9 +177,9 @@ DECLSPEC void m16600 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -189,17 +189,17 @@ DECLSPEC void m16600 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -267,7 +267,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -298,7 +298,7 @@ KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) * main */ - m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) @@ -362,7 +362,7 @@ KERNEL_FQ void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -393,7 +393,7 @@ KERNEL_FQ void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) * main */ - m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) @@ -457,7 +457,7 @@ KERNEL_FQ void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -488,7 +488,7 @@ KERNEL_FQ void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) * main */ - m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) @@ -552,7 +552,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -583,7 +583,7 @@ KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) * main */ - m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) @@ -647,7 +647,7 @@ KERNEL_FQ void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -678,7 +678,7 @@ KERNEL_FQ void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) * main */ - m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) @@ -742,7 +742,7 @@ KERNEL_FQ void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -773,5 +773,5 @@ KERNEL_FQ void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) * main */ - m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m16600_a3-pure.cl b/OpenCL/m16600_a3-pure.cl index f5a9a515d..425459d90 100644 --- a/OpenCL/m16600_a3-pure.cl +++ b/OpenCL/m16600_a3-pure.cl @@ -84,7 +84,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -103,21 +103,21 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop @@ -125,7 +125,7 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -207,9 +207,9 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -223,9 +223,9 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -235,17 +235,17 @@ KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -313,7 +313,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -332,21 +332,21 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) * data */ - const u32 salt_type = esalt_bufs[DIGESTS_OFFSET].salt_type; + const u32 salt_type = esalt_bufs[DIGESTS_OFFSET_HOST].salt_type; u32 encrypted[4]; - encrypted[0] = esalt_bufs[DIGESTS_OFFSET].encrypted[0]; - encrypted[1] = esalt_bufs[DIGESTS_OFFSET].encrypted[1]; - encrypted[2] = esalt_bufs[DIGESTS_OFFSET].encrypted[2]; - encrypted[3] = esalt_bufs[DIGESTS_OFFSET].encrypted[3]; + encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[0]; + encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[1]; + encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[2]; + encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted[3]; u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; /** * loop @@ -354,7 +354,7 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -436,9 +436,9 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) if (is_valid_hex_32 (out[2]) == 0) continue; if (is_valid_hex_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -452,9 +452,9 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) if (is_valid_base58_32 (out[2]) == 0) continue; if (is_valid_base58_32 (out[3]) == 0) continue; - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } @@ -464,17 +464,17 @@ KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) if ((out[1] == 0x0c0c0c0c) && (out[2] == 0x0c0c0c0c) && (out[3] == 0x0c0c0c0c)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } if ((out[1] == 0x0d0d0d0d) && (out[2] == 0x0d0d0d0d) && (out[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m16800-pure.cl b/OpenCL/m16800-pure.cl index 01bed9ca7..98767291c 100644 --- a/OpenCL/m16800-pure.cl +++ b/OpenCL/m16800-pure.cl @@ -89,7 +89,7 @@ KERNEL_FQ void m16800_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx0; @@ -107,7 +107,7 @@ KERNEL_FQ void m16800_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) tmps[gid].opad[3] = sha1_hmac_ctx0.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx0.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx0, esalt_bufs[DIGESTS_OFFSET].essid_buf, esalt_bufs[DIGESTS_OFFSET].essid_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].essid_buf, esalt_bufs[DIGESTS_OFFSET_HOST].essid_len); u32 w0[4]; u32 w1[4]; @@ -193,7 +193,7 @@ KERNEL_FQ void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -227,7 +227,7 @@ KERNEL_FQ void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) out[3] = packv (tmps, out, gid, 3); out[4] = packv (tmps, out, gid, 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -286,7 +286,7 @@ KERNEL_FQ void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) out[3] = packv (tmps, out, gid, 8); out[4] = packv (tmps, out, gid, 9); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -341,7 +341,7 @@ KERNEL_FQ void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -362,9 +362,9 @@ KERNEL_FQ void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) w[14] = 0; w[15] = 0; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_pmkid_t *wpa_pmkid = &esalt_bufs[digest_cur]; @@ -395,7 +395,7 @@ KERNEL_FQ void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } diff --git a/OpenCL/m16801-pure.cl b/OpenCL/m16801-pure.cl index d1a382280..498117936 100644 --- a/OpenCL/m16801-pure.cl +++ b/OpenCL/m16801-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m16801_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 in[16]; @@ -108,7 +108,7 @@ KERNEL_FQ void m16801_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; } KERNEL_FQ void m16801_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) @@ -120,7 +120,7 @@ KERNEL_FQ void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -141,9 +141,9 @@ KERNEL_FQ void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) w[14] = 0; w[15] = 0; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_pmkid_t *wpa_pmkid = &esalt_bufs[digest_cur]; @@ -174,7 +174,7 @@ KERNEL_FQ void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } diff --git a/OpenCL/m16900-pure.cl b/OpenCL/m16900-pure.cl index 29b9e0cc9..d10ae73cb 100644 --- a/OpenCL/m16900-pure.cl +++ b/OpenCL/m16900-pure.cl @@ -86,7 +86,7 @@ KERNEL_FQ void m16900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -110,7 +110,7 @@ KERNEL_FQ void m16900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 2; i < 8; i += 8, j += 1) { @@ -166,7 +166,7 @@ KERNEL_FQ void m16900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -212,7 +212,7 @@ KERNEL_FQ void m16900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -276,7 +276,7 @@ KERNEL_FQ void m16900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -295,7 +295,7 @@ KERNEL_FQ void m16900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_v sha256_hmac_init (&ctx, key, 32); - sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].ct_data_buf, esalt_bufs[DIGESTS_OFFSET].ct_data_len); + sha256_hmac_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_buf, esalt_bufs[DIGESTS_OFFSET_HOST].ct_data_len); sha256_hmac_final(&ctx); diff --git a/OpenCL/m17010-pure.cl b/OpenCL/m17010-pure.cl index 9cb8e2c41..905a88818 100644 --- a/OpenCL/m17010-pure.cl +++ b/OpenCL/m17010-pure.cl @@ -215,16 +215,16 @@ KERNEL_FQ void m17010_init (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 pw_len = pws[gid].pw_len; - const u32 salted_pw_len = (salt_bufs[SALT_POS].salt_len + pw_len); + const u32 salted_pw_len = (salt_bufs[SALT_POS_HOST].salt_len + pw_len); u32 salted_pw_block[80]; // concatenate salt and password -- the salt is always 8 bytes - salted_pw_block[0] = salt_bufs[SALT_POS].salt_buf[0]; - salted_pw_block[1] = salt_bufs[SALT_POS].salt_buf[1]; + salted_pw_block[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salted_pw_block[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; for (u32 idx = 0; idx < 64; idx++) salted_pw_block[idx + 2] = pws[gid].i[idx]; @@ -264,7 +264,7 @@ KERNEL_FQ void m17010_loop_prepare (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].w0[0] = 0; tmps[gid].w0[1] = 0; @@ -283,14 +283,14 @@ KERNEL_FQ void m17010_loop_prepare (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) tmps[gid].w3[2] = 0; tmps[gid].w3[3] = 0; - tmps[gid].len = salt_repeat; + tmps[gid].len = SALT_REPEAT; } KERNEL_FQ void m17010_loop (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // get the prepared buffer from the gpg_tmp_t struct into a local buffer u32 salted_pw_block[80]; @@ -308,7 +308,7 @@ KERNEL_FQ void m17010_loop (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) sha1_ctx_t ctx; - const u32 sha_offset = salt_repeat * 5; + const u32 sha_offset = SALT_REPEAT * 5; for (int i = 0; i < 5; i++) ctx.h[i] = tmps[gid].h[sha_offset + i]; @@ -320,17 +320,17 @@ KERNEL_FQ void m17010_loop (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) ctx.len = tmps[gid].len; // sha-1 of salt and password, up to 'salt_iter' bytes - const u32 salt_iter = salt_bufs[SALT_POS].salt_iter; + const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter; - const u32 salted_pw_block_pos = loop_pos % salted_pw_block_len; - const u32 rounds = (loop_cnt + salted_pw_block_pos) / salted_pw_block_len; + const u32 salted_pw_block_pos = LOOP_POS % salted_pw_block_len; + const u32 rounds = (LOOP_CNT + salted_pw_block_pos) / salted_pw_block_len; for (u32 i = 0; i < rounds; i++) { sha1_update (&ctx, salted_pw_block, salted_pw_block_len); } - if ((loop_pos + loop_cnt) == salt_iter) + if ((LOOP_POS + LOOP_CNT) == salt_iter) { const u32 remaining_bytes = salt_iter % salted_pw_block_len; @@ -406,7 +406,7 @@ KERNEL_FQ void m17010_aux1 (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // retrieve and use the SHA-1 as the key for AES @@ -416,19 +416,19 @@ KERNEL_FQ void m17010_aux1 (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) u32 iv[4] = {0}; - for (int idx = 0; idx < 4; idx++) iv[idx] = esalt_bufs[DIGESTS_OFFSET].iv[idx]; + for (int idx = 0; idx < 4; idx++) iv[idx] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[idx]; u32 decoded_data[384]; - const u32 enc_data_size = esalt_bufs[DIGESTS_OFFSET].encrypted_data_size; + const u32 enc_data_size = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted_data_size; - aes128_decrypt_cfb (esalt_bufs[DIGESTS_OFFSET].encrypted_data, enc_data_size, iv, aes_key, decoded_data, s_te0, s_te1, s_te2, s_te3, s_te4); + aes128_decrypt_cfb (esalt_bufs[DIGESTS_OFFSET_HOST].encrypted_data, enc_data_size, iv, aes_key, decoded_data, s_te0, s_te1, s_te2, s_te3, s_te4); if (check_decoded_data (decoded_data, enc_data_size)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } @@ -476,7 +476,7 @@ KERNEL_FQ void m17010_aux2 (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // retrieve and use the SHA-1 as the key for AES @@ -486,19 +486,19 @@ KERNEL_FQ void m17010_aux2 (KERN_ATTR_TMPS_ESALT (gpg_tmp_t, gpg_t)) u32 iv[4] = {0}; - for (int idx = 0; idx < 4; idx++) iv[idx] = esalt_bufs[DIGESTS_OFFSET].iv[idx]; + for (int idx = 0; idx < 4; idx++) iv[idx] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[idx]; u32 decoded_data[384]; - const u32 enc_data_size = esalt_bufs[DIGESTS_OFFSET].encrypted_data_size; + const u32 enc_data_size = esalt_bufs[DIGESTS_OFFSET_HOST].encrypted_data_size; - aes256_decrypt_cfb (esalt_bufs[DIGESTS_OFFSET].encrypted_data, enc_data_size, iv, aes_key, decoded_data, s_te0, s_te1, s_te2, s_te3, s_te4); + aes256_decrypt_cfb (esalt_bufs[DIGESTS_OFFSET_HOST].encrypted_data, enc_data_size, iv, aes_key, decoded_data, s_te0, s_te1, s_te2, s_te3, s_te4); if (check_decoded_data (decoded_data, enc_data_size)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m17200_a0-pure.cl b/OpenCL/m17200_a0-pure.cl index 70d8c1b95..b0d1ddd6e 100644 --- a/OpenCL/m17200_a0-pure.cl +++ b/OpenCL/m17200_a0-pure.cl @@ -556,12 +556,12 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -569,7 +569,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -579,9 +579,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; /** * base @@ -593,7 +593,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t t = PASTE_PW; @@ -725,16 +725,16 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hash.data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hash.data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hash.data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -756,7 +756,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hash.uncompressed_length) continue; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hash.uncompressed_length) continue; const u32 r0 = ~infstream.crc32; const u32 r1 = 0; @@ -794,20 +794,20 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; /** * base @@ -819,7 +819,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t t = PASTE_PW; @@ -951,16 +951,16 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hash.data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hash.data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hash.data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -982,7 +982,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hash.uncompressed_length) continue; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hash.uncompressed_length) continue; const u32 r0 = ~infstream.crc32; const u32 r1 = 0; diff --git a/OpenCL/m17200_a1-pure.cl b/OpenCL/m17200_a1-pure.cl index e357675c1..05cc05c87 100644 --- a/OpenCL/m17200_a1-pure.cl +++ b/OpenCL/m17200_a1-pure.cl @@ -554,12 +554,12 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -567,7 +567,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -577,11 +577,11 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * loop @@ -599,7 +599,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0 = key0init; u32x key1 = key1init; @@ -727,16 +727,16 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hash.data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hash.data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hash.data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -758,7 +758,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hash.uncompressed_length) continue; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hash.uncompressed_length) continue; const u32 r0 = ~infstream.crc32; const u32 r1 = 0; @@ -796,22 +796,22 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * loop @@ -829,7 +829,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0 = key0init; u32x key1 = key1init; @@ -957,16 +957,16 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hash.data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hash.data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hash.data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -988,7 +988,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hash.uncompressed_length) continue; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hash.uncompressed_length) continue; const u32 r0 = ~infstream.crc32; const u32 r1 = 0; diff --git a/OpenCL/m17200_a3-pure.cl b/OpenCL/m17200_a3-pure.cl index aad87a915..12238c680 100644 --- a/OpenCL/m17200_a3-pure.cl +++ b/OpenCL/m17200_a3-pure.cl @@ -555,12 +555,12 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -568,7 +568,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -578,11 +578,11 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * base @@ -603,7 +603,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -740,16 +740,16 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hash.data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hash.data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hash.data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -771,7 +771,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hash.uncompressed_length) continue; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hash.uncompressed_length) continue; const u32 r0 = ~infstream.crc32; const u32 r1 = 0; @@ -809,22 +809,22 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * base @@ -845,7 +845,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -982,16 +982,16 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; - if (esalt_bufs[DIGESTS_OFFSET].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hash.data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hash.data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hash.data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1013,7 +1013,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hash.uncompressed_length) continue; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hash.uncompressed_length) continue; const u32 r0 = ~infstream.crc32; const u32 r1 = 0; diff --git a/OpenCL/m17210_a0-pure.cl b/OpenCL/m17210_a0-pure.cl index 0f229bd93..72d375a46 100644 --- a/OpenCL/m17210_a0-pure.cl +++ b/OpenCL/m17210_a0-pure.cl @@ -247,12 +247,12 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -260,7 +260,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -270,11 +270,11 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * base @@ -286,7 +286,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -411,7 +411,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u32 j = MAX_LOCAL, i = MAX_LOCAL * 4; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hash.data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[j]; if (data_length >= (i + 1)) { @@ -486,22 +486,22 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * base @@ -513,7 +513,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -638,7 +638,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u32 j = MAX_LOCAL, i = MAX_LOCAL * 4; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hash.data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[j]; if (data_length >= (i + 1)) { diff --git a/OpenCL/m17210_a1-pure.cl b/OpenCL/m17210_a1-pure.cl index 61caf5f4d..5b4a51e47 100644 --- a/OpenCL/m17210_a1-pure.cl +++ b/OpenCL/m17210_a1-pure.cl @@ -245,12 +245,12 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -258,7 +258,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -268,11 +268,11 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * loop @@ -290,7 +290,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0 = key0init; u32x key1 = key1init; @@ -411,7 +411,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u32 j = MAX_LOCAL, i = MAX_LOCAL * 4; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hash.data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[j]; if (data_length >= (i + 1)) { @@ -486,22 +486,22 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * loop @@ -519,7 +519,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0 = key0init; u32x key1 = key1init; @@ -640,7 +640,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u32 j = MAX_LOCAL, i = MAX_LOCAL * 4; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hash.data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[j]; if (data_length >= (i + 1)) { diff --git a/OpenCL/m17210_a3-pure.cl b/OpenCL/m17210_a3-pure.cl index 6bfddf49e..2bbaaf024 100644 --- a/OpenCL/m17210_a3-pure.cl +++ b/OpenCL/m17210_a3-pure.cl @@ -245,12 +245,12 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -258,7 +258,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -268,11 +268,11 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * base @@ -293,7 +293,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -423,7 +423,7 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u32 j = MAX_LOCAL, i = MAX_LOCAL * 4; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hash.data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[j]; if (data_length >= (i + 1)) { @@ -498,22 +498,22 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hash.data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_crc; - const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET].hash.checksum_from_timestamp; - const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET].hash.crc32; - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hash.data_length; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 checksum_from_crc = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_crc; + const u32 checksum_from_timestamp = esalt_bufs[DIGESTS_OFFSET_HOST].hash.checksum_from_timestamp; + const u32 crc32_final = esalt_bufs[DIGESTS_OFFSET_HOST].hash.crc32; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data_length; /** * base @@ -534,7 +534,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -664,7 +664,7 @@ KERNEL_FQ void m17210_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u32 j = MAX_LOCAL, i = MAX_LOCAL * 4; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hash.data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hash.data[j]; if (data_length >= (i + 1)) { diff --git a/OpenCL/m17220_a0-pure.cl b/OpenCL/m17220_a0-pure.cl index ea6ea6dd2..dc2592c1e 100644 --- a/OpenCL/m17220_a0-pure.cl +++ b/OpenCL/m17220_a0-pure.cl @@ -554,12 +554,12 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -571,14 +571,14 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -607,7 +607,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -626,7 +626,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -645,7 +645,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -657,12 +657,12 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); const u32 key0_sav = key0; @@ -672,7 +672,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -698,7 +698,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -721,10 +721,10 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } @@ -734,8 +734,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -757,10 +757,10 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; // we check the crc32, but it might not necessarily be the last one (depending how strict - if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { @@ -770,13 +770,13 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -819,12 +819,12 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -836,14 +836,14 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -872,7 +872,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -891,7 +891,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -910,7 +910,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -922,12 +922,12 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); const u32 key0_sav = key0; @@ -937,7 +937,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -963,7 +963,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -986,10 +986,10 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } @@ -999,8 +999,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1022,14 +1022,14 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; // we check the crc32, but it might not necessarily be the last one (depending how strict - if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17220_a1-pure.cl b/OpenCL/m17220_a1-pure.cl index 040852cde..aef0d2ced 100644 --- a/OpenCL/m17220_a1-pure.cl +++ b/OpenCL/m17220_a1-pure.cl @@ -552,19 +552,19 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -582,7 +582,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0init2 = key0init; u32x key1init2 = key1init; @@ -607,7 +607,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) u32x key2 = key2init2; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -626,7 +626,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -645,7 +645,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -657,12 +657,12 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); const u32 key0_sav = key0; @@ -672,7 +672,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -698,7 +698,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -721,10 +721,10 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } @@ -734,8 +734,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -757,10 +757,10 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; // we check the crc32, but it might not necessarily be the last one (depending how strict - if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { @@ -770,13 +770,13 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -819,19 +819,19 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -849,7 +849,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0init2 = key0init; u32x key1init2 = key1init; @@ -874,7 +874,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) u32x key2 = key2init2; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -893,7 +893,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -912,7 +912,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -924,12 +924,12 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); const u32 key0_sav = key0; @@ -939,7 +939,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -965,7 +965,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -988,10 +988,10 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } @@ -1001,8 +1001,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1024,14 +1024,14 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; // we check the crc32, but it might not necessarily be the last one (depending how strict - if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17220_a3-pure.cl b/OpenCL/m17220_a3-pure.cl index 9fbcd1df5..d612c3626 100644 --- a/OpenCL/m17220_a3-pure.cl +++ b/OpenCL/m17220_a3-pure.cl @@ -552,12 +552,12 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -576,8 +576,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -585,7 +585,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -619,7 +619,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -638,7 +638,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -657,7 +657,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -669,12 +669,12 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); const u32 key0_sav = key0; @@ -684,7 +684,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -710,7 +710,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -733,10 +733,10 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } @@ -746,8 +746,8 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -769,10 +769,10 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; // we check the crc32, but it might not necessarily be the last one (depending how strict - if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { @@ -782,13 +782,13 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -831,12 +831,12 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -855,8 +855,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -864,7 +864,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -898,7 +898,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -917,7 +917,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -936,7 +936,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -948,12 +948,12 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); const u32 key0_sav = key0; @@ -963,7 +963,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -989,7 +989,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -1012,10 +1012,10 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } @@ -1025,8 +1025,8 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1048,14 +1048,14 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; // we check the crc32, but it might not necessarily be the last one (depending how strict - if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if ((~infstream.crc32) == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17225_a0-pure.cl b/OpenCL/m17225_a0-pure.cl index 39ef56bd9..237b29da5 100644 --- a/OpenCL/m17225_a0-pure.cl +++ b/OpenCL/m17225_a0-pure.cl @@ -554,12 +554,12 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -571,14 +571,14 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -607,7 +607,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -626,7 +626,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -645,7 +645,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -657,15 +657,15 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial and uncompressed one, so we need to continue with the next one } @@ -677,11 +677,11 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; tmp[0] = plain; update_key012 (key0, key1, key2, plain, l_crc32tab); @@ -703,7 +703,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -726,25 +726,25 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } u32x crc = 0xffffffff; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8) { mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -766,13 +766,13 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; crc = ~infstream.crc32; } else { - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length; key0 = key0_sav; key1 = key1_sav; @@ -780,7 +780,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u32 j = 3, i = 12; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[j]; if (data_length >= (i + 1)) { @@ -823,7 +823,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) } // we check the crc32, but it might not necessarily be the last one (depending how strict - if (crc == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if (crc == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { @@ -833,13 +833,13 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -882,12 +882,12 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -899,14 +899,14 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -935,7 +935,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -954,7 +954,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -973,7 +973,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -985,15 +985,15 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial and uncompressed one, so we need to continue with the next one } @@ -1005,11 +1005,11 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; tmp[0] = plain; update_key012 (key0, key1, key2, plain, l_crc32tab); @@ -1031,7 +1031,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -1054,25 +1054,25 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } u32x crc = 0xffffffff; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8) { mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1094,13 +1094,13 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; crc = ~infstream.crc32; } else { - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length; key0 = key0_sav; key1 = key1_sav; @@ -1108,7 +1108,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u32 j = 3, i = 12; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[j]; if (data_length >= (i + 1)) { @@ -1151,11 +1151,11 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) } // we check the crc32, but it might not necessarily be the last one (depending how strict - if (crc == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if (crc == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17225_a1-pure.cl b/OpenCL/m17225_a1-pure.cl index 55c36c8e2..635e7697f 100644 --- a/OpenCL/m17225_a1-pure.cl +++ b/OpenCL/m17225_a1-pure.cl @@ -552,19 +552,19 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -582,7 +582,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0init2 = key0init; u32x key1init2 = key1init; @@ -607,7 +607,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) u32x key2 = key2init2; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -626,7 +626,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -645,7 +645,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -657,15 +657,15 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial and uncompressed one, so we need to continue with the next one } @@ -677,11 +677,11 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; tmp[0] = plain; update_key012 (key0, key1, key2, plain, l_crc32tab); @@ -703,7 +703,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -726,25 +726,25 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } u32x crc = 0xffffffff; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8) { mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -766,12 +766,12 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; crc = ~infstream.crc32; } else{ - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length; key0 = key0_sav; key1 = key1_sav; @@ -779,7 +779,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u32 j = 3, i = 12; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[j]; if (data_length >= (i + 1)) { @@ -822,7 +822,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) } // we check the crc32, but it might not necessarily be the last one (depending how strict - if (crc == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if (crc == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { @@ -832,13 +832,13 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -881,19 +881,19 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -911,7 +911,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0init2 = key0init; u32x key1init2 = key1init; @@ -936,7 +936,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) u32x key2 = key2init2; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -955,7 +955,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -974,7 +974,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -986,15 +986,15 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial and uncompressed one, so we need to continue with the next one } @@ -1006,11 +1006,11 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; tmp[0] = plain; update_key012 (key0, key1, key2, plain, l_crc32tab); @@ -1032,7 +1032,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -1055,25 +1055,25 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } u32x crc = 0xffffffff; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8) { mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1095,12 +1095,12 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; crc = ~infstream.crc32; } else{ - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length; key0 = key0_sav; key1 = key1_sav; @@ -1108,7 +1108,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u32 j = 3, i = 12; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[j]; if (data_length >= (i + 1)) { @@ -1151,11 +1151,11 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t)) } // we check the crc32, but it might not necessarily be the last one (depending how strict - if (crc == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if (crc == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17225_a3-pure.cl b/OpenCL/m17225_a3-pure.cl index a049fe115..4ec736a51 100644 --- a/OpenCL/m17225_a3-pure.cl +++ b/OpenCL/m17225_a3-pure.cl @@ -552,12 +552,12 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -576,8 +576,8 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -585,7 +585,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -619,7 +619,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -638,7 +638,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -657,7 +657,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -669,15 +669,15 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial and uncompressed one, so we need to continue with the next one } @@ -689,11 +689,11 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; tmp[0] = plain; update_key012 (key0, key1, key2, plain, l_crc32tab); @@ -715,7 +715,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -738,25 +738,25 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } u32x crc = 0xffffffff; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8) { mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -778,13 +778,13 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; crc = ~infstream.crc32; } else { - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length; key0 = key0_sav; key1 = key1_sav; @@ -792,7 +792,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u32 j = 3, i = 12; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[j]; if (data_length >= (i + 1)) { @@ -834,7 +834,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) crc = ~crc; } - if (crc == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if (crc == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { @@ -844,13 +844,13 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -893,12 +893,12 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -917,8 +917,8 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -926,7 +926,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -960,7 +960,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -979,7 +979,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -998,7 +998,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -1010,15 +1010,15 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 0 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial and uncompressed one, so we need to continue with the next one } @@ -1030,11 +1030,11 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u8 tmp[TMPSIZ]; if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; tmp[0] = plain; update_key012 (key0, key1, key2, plain, l_crc32tab); @@ -1056,7 +1056,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (int i = 16; i < 36; i += 4) { if (idx == 0) next = l_data[i / 4]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[i / 4]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[i / 4]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -1079,25 +1079,25 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length >= 36 && esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_type_enum == 1) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_type_enum == 1) { continue; // so far everything matches for this hash, but it's only a partial one, so we need to continue with the next one } u32x crc = 0xffffffff; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8) + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8) { mz_stream infstream; inflate_state pStream; infstream.opaque = Z_NULL; - infstream.avail_in = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length - 12; // size of input - infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET].hashes[idx].data + 12; // input char array + infstream.avail_in = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length - 12; // size of input + infstream.next_in = (GLOBAL_AS u8 *) esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data + 12; // input char array infstream.avail_out = TMPSIZ; // size of output infstream.next_out = tmp; // output char array @@ -1119,13 +1119,13 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) ret = hc_inflate (&infstream); } - if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET].hashes[idx].uncompressed_length) break; + if (ret != MZ_STREAM_END || infstream.total_out != esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].uncompressed_length) break; crc = ~infstream.crc32; } else { - const u32 data_length = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data_length; + const u32 data_length = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data_length; key0 = key0_sav; key1 = key1_sav; @@ -1133,7 +1133,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u32 j = 3, i = 12; i < data_length; j++, i += 4) { - next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[j]; + next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[j]; if (data_length >= (i + 1)) { @@ -1175,11 +1175,11 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) crc = ~crc; } - if (crc == esalt_bufs[DIGESTS_OFFSET].hashes[idx].crc32) + if (crc == esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].crc32) { if (idx + 1 == hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17230_a0-pure.cl b/OpenCL/m17230_a0-pure.cl index 9d7b23571..135bce718 100644 --- a/OpenCL/m17230_a0-pure.cl +++ b/OpenCL/m17230_a0-pure.cl @@ -247,12 +247,12 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -264,14 +264,14 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -300,7 +300,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -319,7 +319,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -338,7 +338,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -350,22 +350,22 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; - if (idx + 1 == esalt_bufs[DIGESTS_OFFSET].hash_count) + if (idx + 1 == esalt_bufs[DIGESTS_OFFSET_HOST].hash_count) { /** * digest @@ -373,13 +373,13 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { - esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc, + esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc, 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -417,12 +417,12 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -434,14 +434,14 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -470,7 +470,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -489,7 +489,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -508,7 +508,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -520,24 +520,24 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; - if (idx + 1 == esalt_bufs[DIGESTS_OFFSET].hash_count) + if (idx + 1 == esalt_bufs[DIGESTS_OFFSET_HOST].hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17230_a1-pure.cl b/OpenCL/m17230_a1-pure.cl index c46102674..ddac95eab 100644 --- a/OpenCL/m17230_a1-pure.cl +++ b/OpenCL/m17230_a1-pure.cl @@ -245,19 +245,19 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -275,7 +275,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0init2 = key0init; u32x key1init2 = key1init; @@ -300,7 +300,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) u32x key2 = key2init2; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -319,7 +319,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -338,7 +338,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -350,22 +350,22 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; - if (idx + 1 == esalt_bufs[DIGESTS_OFFSET].hash_count) + if (idx + 1 == esalt_bufs[DIGESTS_OFFSET_HOST].hash_count) { /** * digest @@ -373,13 +373,13 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { - esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc, + esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc, 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -417,19 +417,19 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -447,7 +447,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t)) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32x key0init2 = key0init; u32x key1init2 = key1init; @@ -472,7 +472,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t)) u32x key2 = key2init2; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -491,7 +491,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -510,7 +510,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -522,24 +522,24 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; - if (idx + 1 == esalt_bufs[DIGESTS_OFFSET].hash_count) + if (idx + 1 == esalt_bufs[DIGESTS_OFFSET_HOST].hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17230_a3-pure.cl b/OpenCL/m17230_a3-pure.cl index 8c9d1b23a..46e5a8949 100644 --- a/OpenCL/m17230_a3-pure.cl +++ b/OpenCL/m17230_a3-pure.cl @@ -245,12 +245,12 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -269,8 +269,8 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -278,7 +278,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -314,7 +314,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -333,7 +333,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -352,7 +352,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -364,20 +364,20 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; if (idx + 1 == hash_count) { @@ -387,13 +387,13 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { - esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc, + esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc, 0, 0, 0 }; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; @@ -431,12 +431,12 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) for (u64 i = lid; i < MAX_LOCAL; i += lsz) { - l_data[i] = esalt_bufs[DIGESTS_OFFSET].hashes[0].data[i]; + l_data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].data[i]; } SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -455,8 +455,8 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) * prefetch from global memory */ - const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET].checksum_size; - const u32 hash_count = esalt_bufs[DIGESTS_OFFSET].hash_count; + const u32 checksum_size = esalt_bufs[DIGESTS_OFFSET_HOST].checksum_size; + const u32 hash_count = esalt_bufs[DIGESTS_OFFSET_HOST].hash_count; /** * loop @@ -464,7 +464,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -500,7 +500,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) u32x key2 = key2init; if (idx == 0) next = l_data[0]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[0]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[0]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -519,7 +519,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[1]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[1]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[1]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -538,7 +538,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[2]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[2]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[2]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; @@ -550,24 +550,24 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key3 (key2, key3); plain = unpack_v8c_from_v32_S (next) ^ key3; - if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; + if ((checksum_size == 2) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc & 0xff) != plain) && ((esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp & 0xff) != plain)) break; update_key012 (key0, key1, key2, plain, l_crc32tab); update_key3 (key2, key3); plain = unpack_v8d_from_v32_S (next) ^ key3; - if ((plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET].hashes[idx].checksum_from_timestamp >> 8))) break; + if ((plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_crc >> 8)) && (plain != (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].checksum_from_timestamp >> 8))) break; update_key012 (key0, key1, key2, plain, l_crc32tab); if (idx == 0) next = l_data[3]; - else next = esalt_bufs[DIGESTS_OFFSET].hashes[idx].data[3]; + else next = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].data[3]; update_key3 (key2, key3); plain = unpack_v8a_from_v32_S (next) ^ key3; - if (esalt_bufs[DIGESTS_OFFSET].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; + if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break; - if (idx + 1 == esalt_bufs[DIGESTS_OFFSET].hash_count) + if (idx + 1 == esalt_bufs[DIGESTS_OFFSET_HOST].hash_count) { - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].hashes[0].checksum_from_crc; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].hashes[0].checksum_from_crc; const u32 r1 = 0; const u32 r2 = 0; const u32 r3 = 0; diff --git a/OpenCL/m17300_a0-optimized.cl b/OpenCL/m17300_a0-optimized.cl index 8523b504f..c9d50fa42 100644 --- a/OpenCL/m17300_a0-optimized.cl +++ b/OpenCL/m17300_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17300_a1-optimized.cl b/OpenCL/m17300_a1-optimized.cl index e10975547..771e939ea 100644 --- a/OpenCL/m17300_a1-optimized.cl +++ b/OpenCL/m17300_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17300_a3-optimized.cl b/OpenCL/m17300_a3-optimized.cl index 0ae7ede66..3290cabd0 100644 --- a/OpenCL/m17300_a3-optimized.cl +++ b/OpenCL/m17300_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) * main */ - m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17300_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17300_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17300_m08 (KERN_ATTR_BASIC ()) * main */ - m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17300_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17300_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17300_m16 (KERN_ATTR_BASIC ()) * main */ - m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) * main */ - m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17300_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17300_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17300_s08 (KERN_ATTR_BASIC ()) * main */ - m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17300_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17300_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17300_s16 (KERN_ATTR_BASIC ()) * main */ - m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m17400_a0-optimized.cl b/OpenCL/m17400_a0-optimized.cl index de148319b..f6d3b883d 100644 --- a/OpenCL/m17400_a0-optimized.cl +++ b/OpenCL/m17400_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17400_a1-optimized.cl b/OpenCL/m17400_a1-optimized.cl index 07905feff..437223264 100644 --- a/OpenCL/m17400_a1-optimized.cl +++ b/OpenCL/m17400_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17400_a3-optimized.cl b/OpenCL/m17400_a3-optimized.cl index 989680c60..bfb92f850 100644 --- a/OpenCL/m17400_a3-optimized.cl +++ b/OpenCL/m17400_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) * main */ - m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17400_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17400_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17400_m08 (KERN_ATTR_BASIC ()) * main */ - m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17400_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17400_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17400_m16 (KERN_ATTR_BASIC ()) * main */ - m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) * main */ - m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17400_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17400_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17400_s08 (KERN_ATTR_BASIC ()) * main */ - m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17400_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17400_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17400_s16 (KERN_ATTR_BASIC ()) * main */ - m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m17500_a0-optimized.cl b/OpenCL/m17500_a0-optimized.cl index 81c112d50..db051d3ca 100644 --- a/OpenCL/m17500_a0-optimized.cl +++ b/OpenCL/m17500_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17500_a1-optimized.cl b/OpenCL/m17500_a1-optimized.cl index 90ec39fd3..df22d1592 100644 --- a/OpenCL/m17500_a1-optimized.cl +++ b/OpenCL/m17500_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17500_a3-optimized.cl b/OpenCL/m17500_a3-optimized.cl index 3b8ffeba2..cb56d74cd 100644 --- a/OpenCL/m17500_a3-optimized.cl +++ b/OpenCL/m17500_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) * main */ - m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17500_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17500_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17500_m08 (KERN_ATTR_BASIC ()) * main */ - m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17500_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17500_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17500_m16 (KERN_ATTR_BASIC ()) * main */ - m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) * main */ - m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17500_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17500_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17500_s08 (KERN_ATTR_BASIC ()) * main */ - m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17500_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17500_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17500_s16 (KERN_ATTR_BASIC ()) * main */ - m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m17600_a0-optimized.cl b/OpenCL/m17600_a0-optimized.cl index a9bec0257..3263f9b63 100644 --- a/OpenCL/m17600_a0-optimized.cl +++ b/OpenCL/m17600_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17600_a1-optimized.cl b/OpenCL/m17600_a1-optimized.cl index 18212f768..961d8c641 100644 --- a/OpenCL/m17600_a1-optimized.cl +++ b/OpenCL/m17600_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17600_a3-optimized.cl b/OpenCL/m17600_a3-optimized.cl index 5897c897e..e7a66cb38 100644 --- a/OpenCL/m17600_a3-optimized.cl +++ b/OpenCL/m17600_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) * main */ - m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17600_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17600_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17600_m08 (KERN_ATTR_BASIC ()) * main */ - m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17600_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17600_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17600_m16 (KERN_ATTR_BASIC ()) * main */ - m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) * main */ - m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17600_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17600_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17600_s08 (KERN_ATTR_BASIC ()) * main */ - m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17600_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17600_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17600_s16 (KERN_ATTR_BASIC ()) * main */ - m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m17700_a0-optimized.cl b/OpenCL/m17700_a0-optimized.cl index c801e6808..78cda655c 100644 --- a/OpenCL/m17700_a0-optimized.cl +++ b/OpenCL/m17700_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17700_a1-optimized.cl b/OpenCL/m17700_a1-optimized.cl index 6837adcc4..249284fd1 100644 --- a/OpenCL/m17700_a1-optimized.cl +++ b/OpenCL/m17700_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17700_a3-optimized.cl b/OpenCL/m17700_a3-optimized.cl index a0478c740..c09114d48 100644 --- a/OpenCL/m17700_a3-optimized.cl +++ b/OpenCL/m17700_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) * main */ - m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17700_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17700_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17700_m08 (KERN_ATTR_BASIC ()) * main */ - m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17700_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17700_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17700_m16 (KERN_ATTR_BASIC ()) * main */ - m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) * main */ - m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17700_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17700_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17700_s08 (KERN_ATTR_BASIC ()) * main */ - m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17700_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17700_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17700_s16 (KERN_ATTR_BASIC ()) * main */ - m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m17800_a0-optimized.cl b/OpenCL/m17800_a0-optimized.cl index 7f5b4e9f8..89208d59c 100644 --- a/OpenCL/m17800_a0-optimized.cl +++ b/OpenCL/m17800_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17800_a1-optimized.cl b/OpenCL/m17800_a1-optimized.cl index f4aaca952..7fd3f92aa 100644 --- a/OpenCL/m17800_a1-optimized.cl +++ b/OpenCL/m17800_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17800_a3-optimized.cl b/OpenCL/m17800_a3-optimized.cl index dbb761026..c3d5144e3 100644 --- a/OpenCL/m17800_a3-optimized.cl +++ b/OpenCL/m17800_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) * main */ - m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17800_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17800_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17800_m08 (KERN_ATTR_BASIC ()) * main */ - m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17800_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17800_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17800_m16 (KERN_ATTR_BASIC ()) * main */ - m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) * main */ - m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17800_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17800_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17800_s08 (KERN_ATTR_BASIC ()) * main */ - m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17800_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17800_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17800_s16 (KERN_ATTR_BASIC ()) * main */ - m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17400s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m17900_a0-optimized.cl b/OpenCL/m17900_a0-optimized.cl index 797750ce3..edf22f55b 100644 --- a/OpenCL/m17900_a0-optimized.cl +++ b/OpenCL/m17900_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m17900_a1-optimized.cl b/OpenCL/m17900_a1-optimized.cl index a063d7e18..b0599f939 100644 --- a/OpenCL/m17900_a1-optimized.cl +++ b/OpenCL/m17900_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m17900_a3-optimized.cl b/OpenCL/m17900_a3-optimized.cl index ad1cbb93d..eb056479e 100644 --- a/OpenCL/m17900_a3-optimized.cl +++ b/OpenCL/m17900_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) * main */ - m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17900_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m17900_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m17900_m08 (KERN_ATTR_BASIC ()) * main */ - m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17900_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m17900_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m17900_m16 (KERN_ATTR_BASIC ()) * main */ - m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) * main */ - m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17900_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m17900_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m17900_s08 (KERN_ATTR_BASIC ()) * main */ - m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m17900_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m17900_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m17900_s16 (KERN_ATTR_BASIC ()) * main */ - m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17500s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m18000_a0-optimized.cl b/OpenCL/m18000_a0-optimized.cl index 349526fcb..d266dfb11 100644 --- a/OpenCL/m18000_a0-optimized.cl +++ b/OpenCL/m18000_a0-optimized.cl @@ -43,7 +43,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -63,7 +63,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -261,7 +261,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -283,17 +283,17 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m18000_a1-optimized.cl b/OpenCL/m18000_a1-optimized.cl index d8565bca2..62bfbcc79 100644 --- a/OpenCL/m18000_a1-optimized.cl +++ b/OpenCL/m18000_a1-optimized.cl @@ -41,7 +41,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -61,7 +61,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -99,7 +99,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -318,7 +318,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -340,17 +340,17 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -388,7 +388,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m18000_a3-optimized.cl b/OpenCL/m18000_a3-optimized.cl index 40dc22695..b5623cebc 100644 --- a/OpenCL/m18000_a3-optimized.cl +++ b/OpenCL/m18000_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m17600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -228,10 +228,10 @@ DECLSPEC void m17600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -240,7 +240,7 @@ DECLSPEC void m17600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -419,7 +419,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -455,7 +455,7 @@ KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) * main */ - m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18000_m08 (KERN_ATTR_BASIC ()) @@ -466,7 +466,7 @@ KERNEL_FQ void m18000_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -502,7 +502,7 @@ KERNEL_FQ void m18000_m08 (KERN_ATTR_BASIC ()) * main */ - m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18000_m16 (KERN_ATTR_BASIC ()) @@ -513,7 +513,7 @@ KERNEL_FQ void m18000_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -549,7 +549,7 @@ KERNEL_FQ void m18000_m16 (KERN_ATTR_BASIC ()) * main */ - m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) @@ -560,7 +560,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -596,7 +596,7 @@ KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) * main */ - m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18000_s08 (KERN_ATTR_BASIC ()) @@ -607,7 +607,7 @@ KERNEL_FQ void m18000_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -643,7 +643,7 @@ KERNEL_FQ void m18000_s08 (KERN_ATTR_BASIC ()) * main */ - m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18000_s16 (KERN_ATTR_BASIC ()) @@ -654,7 +654,7 @@ KERNEL_FQ void m18000_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -690,5 +690,5 @@ KERNEL_FQ void m18000_s16 (KERN_ATTR_BASIC ()) * main */ - m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m17600s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m18100_a0-pure.cl b/OpenCL/m18100_a0-pure.cl index b67195ff3..796efeda5 100644 --- a/OpenCL/m18100_a0-pure.cl +++ b/OpenCL/m18100_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,14 +39,14 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_RULES ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -102,7 +102,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -110,10 +110,10 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -128,14 +128,14 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_RULES ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m18100_a1-pure.cl b/OpenCL/m18100_a1-pure.cl index 7571b10dc..6e08f1393 100644 --- a/OpenCL/m18100_a1-pure.cl +++ b/OpenCL/m18100_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,14 +44,14 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_BASIC ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -125,7 +125,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -133,10 +133,10 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -158,14 +158,14 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_BASIC ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m18100_a3-pure.cl b/OpenCL/m18100_a3-pure.cl index aac11ef2e..84573247b 100644 --- a/OpenCL/m18100_a3-pure.cl +++ b/OpenCL/m18100_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_VECTOR ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -53,7 +53,7 @@ KERNEL_FQ void m18100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,7 +112,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -120,10 +120,10 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -145,7 +145,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_VECTOR ()) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -154,7 +154,7 @@ KERNEL_FQ void m18100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m18200_a0-optimized.cl b/OpenCL/m18200_a0-optimized.cl index 9f0e8ef20..942d89552 100644 --- a/OpenCL/m18200_a0-optimized.cl +++ b/OpenCL/m18200_a0-optimized.cl @@ -460,7 +460,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -494,16 +494,16 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -529,11 +529,11 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -556,7 +556,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -590,16 +590,16 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -625,11 +625,11 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m18200_a0-pure.cl b/OpenCL/m18200_a0-pure.cl index d8b8abe8b..c7bf1af5e 100644 --- a/OpenCL/m18200_a0-pure.cl +++ b/OpenCL/m18200_a0-pure.cl @@ -272,7 +272,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -284,16 +284,16 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -313,11 +313,11 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -332,7 +332,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -344,16 +344,16 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -373,11 +373,11 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m18200_a1-optimized.cl b/OpenCL/m18200_a1-optimized.cl index 051b6c64f..e8953e107 100644 --- a/OpenCL/m18200_a1-optimized.cl +++ b/OpenCL/m18200_a1-optimized.cl @@ -463,7 +463,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -491,16 +491,16 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -538,7 +538,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -576,11 +576,11 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -608,7 +608,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -636,16 +636,16 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -683,7 +683,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -721,11 +721,11 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m18200_a1-pure.cl b/OpenCL/m18200_a1-pure.cl index de5cbc279..3a67131da 100644 --- a/OpenCL/m18200_a1-pure.cl +++ b/OpenCL/m18200_a1-pure.cl @@ -270,7 +270,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -280,10 +280,10 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; md4_ctx_t ctx0; @@ -295,7 +295,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -309,11 +309,11 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -328,7 +328,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -338,10 +338,10 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; md4_ctx_t ctx0; @@ -353,7 +353,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md4_ctx_t ctx = ctx0; @@ -367,11 +367,11 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m18200_a3-optimized.cl b/OpenCL/m18200_a3-optimized.cl index e4398a99a..446d26b1e 100644 --- a/OpenCL/m18200_a3-optimized.cl +++ b/OpenCL/m18200_a3-optimized.cl @@ -464,10 +464,10 @@ DECLSPEC void m18200 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop @@ -475,7 +475,7 @@ DECLSPEC void m18200 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 w0l = w0[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 w0r = bfs_buf[il_pos].i; @@ -498,11 +498,11 @@ DECLSPEC void m18200 (LOCAL_AS u32 *S, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const tmp[2] = digest[2]; tmp[3] = digest[3]; - if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, tmp, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -517,7 +517,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -555,7 +555,7 @@ KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) @@ -567,7 +567,7 @@ KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -605,7 +605,7 @@ KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18200_m16 (KERN_ATTR_ESALT (krb5asrep_t)) @@ -621,7 +621,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -659,7 +659,7 @@ KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) @@ -671,7 +671,7 @@ KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -709,7 +709,7 @@ KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) LOCAL_VK u32 S[64 * FIXED_LOCAL_SIZE]; - m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18200 (S, w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18200_s16 (KERN_ATTR_ESALT (krb5asrep_t)) diff --git a/OpenCL/m18200_a3-pure.cl b/OpenCL/m18200_a3-pure.cl index 5bb9c6e15..0ec0ed521 100644 --- a/OpenCL/m18200_a3-pure.cl +++ b/OpenCL/m18200_a3-pure.cl @@ -270,7 +270,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -289,10 +289,10 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop @@ -300,7 +300,7 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -322,11 +322,11 @@ KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -341,7 +341,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -360,10 +360,10 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) u32 checksum[4]; - checksum[0] = esalt_bufs[DIGESTS_OFFSET].checksum[0]; - checksum[1] = esalt_bufs[DIGESTS_OFFSET].checksum[1]; - checksum[2] = esalt_bufs[DIGESTS_OFFSET].checksum[2]; - checksum[3] = esalt_bufs[DIGESTS_OFFSET].checksum[3]; + checksum[0] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]; + checksum[1] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]; + checksum[2] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]; + checksum[3] = esalt_bufs[DIGESTS_OFFSET_HOST].checksum[3]; /** * loop @@ -371,7 +371,7 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -393,11 +393,11 @@ KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) kerb_prepare (ctx.h, checksum, digest, K2); - if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET].edata2, esalt_bufs[DIGESTS_OFFSET].edata2_len, K2, checksum) == 1) + if (decrypt_and_check (S, digest, esalt_bufs[DIGESTS_OFFSET_HOST].edata2, esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len, K2, checksum) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m18300-pure.cl b/OpenCL/m18300-pure.cl index 772b934b5..645437f42 100644 --- a/OpenCL/m18300-pure.cl +++ b/OpenCL/m18300-pure.cl @@ -87,7 +87,7 @@ KERNEL_FQ void m18300_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -111,7 +111,7 @@ KERNEL_FQ void m18300_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].ZCRYPTOSALT, 16); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOSALT, 16); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -167,7 +167,7 @@ KERNEL_FQ void m18300_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -213,7 +213,7 @@ KERNEL_FQ void m18300_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -326,7 +326,7 @@ KERNEL_FQ void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -353,16 +353,16 @@ KERNEL_FQ void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl u32 P3[2]; u32 P4[2]; - A[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[0]); - A[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[1]); - P1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[2]); - P1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[3]); - P2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[4]); - P2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[5]); - P3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[6]); - P3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[7]); - P4[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[8]); - P4[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].ZCRYPTOWRAPPEDKEY[9]); + A[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[0]); + A[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[1]); + P1[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[2]); + P1[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[3]); + P2[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[4]); + P2[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[5]); + P3[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[6]); + P3[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[7]); + P4[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[8]); + P4[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].ZCRYPTOWRAPPEDKEY[9]); for (int j = 5; j >= 0; j--) { @@ -434,9 +434,9 @@ KERNEL_FQ void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, appl if ((A[0] == 0xa6a6a6a6) && (A[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m18400-pure.cl b/OpenCL/m18400-pure.cl index 7381875a9..80756134d 100644 --- a/OpenCL/m18400-pure.cl +++ b/OpenCL/m18400-pure.cl @@ -82,7 +82,7 @@ KERNEL_FQ void m18400_init (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t sha256_ctx; @@ -121,10 +121,10 @@ KERNEL_FQ void m18400_init (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) u32 m2[4]; u32 m3[4]; - m0[0] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET].salt_buf[0]); - m0[1] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET].salt_buf[1]); - m0[2] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET].salt_buf[2]); - m0[3] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET].salt_buf[3]); + m0[0] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[0]); + m0[1] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[1]); + m0[2] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[2]); + m0[3] = hc_swap32_S (salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[3]); m1[0] = 0; m1[1] = 0; m1[2] = 0; @@ -183,7 +183,7 @@ KERNEL_FQ void m18400_loop (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -218,7 +218,7 @@ KERNEL_FQ void m18400_loop (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -322,7 +322,7 @@ KERNEL_FQ void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -343,7 +343,7 @@ KERNEL_FQ void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) aes256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - GLOBAL_AS const odf12_t *es = &esalt_bufs[DIGESTS_OFFSET]; + GLOBAL_AS const odf12_t *es = &esalt_bufs[DIGESTS_OFFSET_HOST]; u32 iv[4]; diff --git a/OpenCL/m18500_a0-pure.cl b/OpenCL/m18500_a0-pure.cl index 133b5618c..a80390539 100644 --- a/OpenCL/m18500_a0-pure.cl +++ b/OpenCL/m18500_a0-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -64,7 +64,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -168,7 +168,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -176,10 +176,10 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -192,7 +192,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m18500_a1-pure.cl b/OpenCL/m18500_a1-pure.cl index c775a024d..bcc2f98ad 100644 --- a/OpenCL/m18500_a1-pure.cl +++ b/OpenCL/m18500_a1-pure.cl @@ -52,7 +52,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,7 +68,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx0 = ctx; @@ -167,7 +167,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -195,7 +195,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx0 = ctx; diff --git a/OpenCL/m18500_a3-pure.cl b/OpenCL/m18500_a3-pure.cl index d72552dda..b257c1826 100644 --- a/OpenCL/m18500_a3-pure.cl +++ b/OpenCL/m18500_a3-pure.cl @@ -50,7 +50,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -71,7 +71,7 @@ KERNEL_FQ void m18500_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32x w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -177,7 +177,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -185,10 +185,10 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -210,7 +210,7 @@ KERNEL_FQ void m18500_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32x w0r = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl index f98aca9c0..6373da9ed 100644 --- a/OpenCL/m18600-pure.cl +++ b/OpenCL/m18600-pure.cl @@ -459,7 +459,7 @@ KERNEL_FQ void m18600_init (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t sha1_ctx; @@ -498,10 +498,10 @@ KERNEL_FQ void m18600_init (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) u32 m2[4]; u32 m3[4]; - m0[0] = salt_bufs[DIGESTS_OFFSET].salt_buf[0]; - m0[1] = salt_bufs[DIGESTS_OFFSET].salt_buf[1]; - m0[2] = salt_bufs[DIGESTS_OFFSET].salt_buf[2]; - m0[3] = salt_bufs[DIGESTS_OFFSET].salt_buf[3]; + m0[0] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[0]; + m0[1] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[1]; + m0[2] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[2]; + m0[3] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[3]; m1[0] = 0; m1[1] = 0; m1[2] = 0; @@ -557,7 +557,7 @@ KERNEL_FQ void m18600_loop (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -589,7 +589,7 @@ KERNEL_FQ void m18600_loop (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) out[3] = packv (tmps, out, gid, 3); out[4] = packv (tmps, out, gid, 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -641,7 +641,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE_COMP) m18600_comp (KERN_ATTR_ const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -757,7 +757,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE_COMP) m18600_comp (KERN_ATTR_ SET_KEY32 (S3, i + 3, R0); } - GLOBAL_AS const odf11_t *es = &esalt_bufs[DIGESTS_OFFSET]; + GLOBAL_AS const odf11_t *es = &esalt_bufs[DIGESTS_OFFSET_HOST]; u32 ct[2]; diff --git a/OpenCL/m18700_a0-optimized.cl b/OpenCL/m18700_a0-optimized.cl index 51581de8c..c962009ec 100644 --- a/OpenCL/m18700_a0-optimized.cl +++ b/OpenCL/m18700_a0-optimized.cl @@ -67,7 +67,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -87,7 +87,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w[16] = { 0 }; @@ -126,7 +126,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -148,7 +148,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -158,7 +158,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w[16] = { 0 }; diff --git a/OpenCL/m18700_a0-pure.cl b/OpenCL/m18700_a0-pure.cl index 9ea3269b2..42f40399b 100644 --- a/OpenCL/m18700_a0-pure.cl +++ b/OpenCL/m18700_a0-pure.cl @@ -63,7 +63,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -75,7 +75,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -101,7 +101,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,7 +109,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -125,7 +125,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m18700_a1-optimized.cl b/OpenCL/m18700_a1-optimized.cl index 027f24423..51063e2af 100644 --- a/OpenCL/m18700_a1-optimized.cl +++ b/OpenCL/m18700_a1-optimized.cl @@ -67,17 +67,17 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * loop */ - 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) { u32 hash = 0; - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len); hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); @@ -119,7 +119,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -127,7 +127,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -137,11 +137,11 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_BASIC ()) * loop */ - 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) { u32 hash = 0; - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len); hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); diff --git a/OpenCL/m18700_a1-pure.cl b/OpenCL/m18700_a1-pure.cl index dafc1b13c..2a7e5ed60 100644 --- a/OpenCL/m18700_a1-pure.cl +++ b/OpenCL/m18700_a1-pure.cl @@ -61,17 +61,17 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32 hash = 0; - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len); hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); @@ -100,7 +100,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -108,7 +108,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -118,11 +118,11 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { u32 hash = 0; - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { hash = hashCode_g (hash, pws[gid].i, pws[gid].pw_len); hash = hashCode_g (hash, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); diff --git a/OpenCL/m18700_a3-optimized.cl b/OpenCL/m18700_a3-optimized.cl index 01490025c..cba3f8a6c 100644 --- a/OpenCL/m18700_a3-optimized.cl +++ b/OpenCL/m18700_a3-optimized.cl @@ -85,7 +85,7 @@ DECLSPEC void m18700m (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -117,7 +117,7 @@ DECLSPEC void m18700s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -129,7 +129,7 @@ DECLSPEC void m18700s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -154,7 +154,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -181,7 +181,7 @@ KERNEL_FQ void m18700_m04 (KERN_ATTR_VECTOR ()) * main */ - m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18700_m08 (KERN_ATTR_VECTOR ()) @@ -192,7 +192,7 @@ KERNEL_FQ void m18700_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -219,7 +219,7 @@ KERNEL_FQ void m18700_m08 (KERN_ATTR_VECTOR ()) * main */ - m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18700_m16 (KERN_ATTR_VECTOR ()) @@ -230,7 +230,7 @@ KERNEL_FQ void m18700_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -257,7 +257,7 @@ KERNEL_FQ void m18700_m16 (KERN_ATTR_VECTOR ()) * main */ - m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18700_s04 (KERN_ATTR_VECTOR ()) @@ -268,7 +268,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -295,7 +295,7 @@ KERNEL_FQ void m18700_s04 (KERN_ATTR_VECTOR ()) * main */ - m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18700_s08 (KERN_ATTR_VECTOR ()) @@ -306,7 +306,7 @@ KERNEL_FQ void m18700_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -333,7 +333,7 @@ KERNEL_FQ void m18700_s08 (KERN_ATTR_VECTOR ()) * main */ - m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m18700_s16 (KERN_ATTR_VECTOR ()) @@ -344,7 +344,7 @@ KERNEL_FQ void m18700_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -371,5 +371,5 @@ KERNEL_FQ void m18700_s16 (KERN_ATTR_VECTOR ()) * main */ - m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m18700_a3-pure.cl b/OpenCL/m18700_a3-pure.cl index 72874e5c2..95e819a8f 100644 --- a/OpenCL/m18700_a3-pure.cl +++ b/OpenCL/m18700_a3-pure.cl @@ -79,7 +79,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -100,7 +100,7 @@ KERNEL_FQ void m18700_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -126,7 +126,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -134,7 +134,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -159,7 +159,7 @@ KERNEL_FQ void m18700_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m18800-pure.cl b/OpenCL/m18800-pure.cl index 9f764dc68..4d0c02601 100644 --- a/OpenCL/m18800-pure.cl +++ b/OpenCL/m18800-pure.cl @@ -31,13 +31,13 @@ KERNEL_FQ void m18800_init (KERN_ATTR_TMPS (bsp_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t ctx; sha256_init (&ctx); - sha256_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -57,7 +57,7 @@ KERNEL_FQ void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x digest[8]; @@ -70,7 +70,7 @@ KERNEL_FQ void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t)) digest[6] = packv (tmps, hash, gid, 6); digest[7] = packv (tmps, hash, gid, 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -124,7 +124,7 @@ KERNEL_FQ void m18800_comp (KERN_ATTR_TMPS (bsp_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m18900-pure.cl b/OpenCL/m18900-pure.cl index dc3758ba7..750e33d31 100644 --- a/OpenCL/m18900-pure.cl +++ b/OpenCL/m18900-pure.cl @@ -84,7 +84,7 @@ KERNEL_FQ void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -102,7 +102,7 @@ KERNEL_FQ void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -152,7 +152,7 @@ KERNEL_FQ void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -186,7 +186,7 @@ KERNEL_FQ void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -290,7 +290,7 @@ KERNEL_FQ void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -315,17 +315,17 @@ KERNEL_FQ void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ u32 iv[4]; - iv[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[16]); - iv[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[17]); - iv[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[18]); - iv[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[19]); + iv[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[16]); + iv[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[17]); + iv[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[18]); + iv[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[19]); u32 ct[4]; - ct[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[20]); - ct[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[21]); - ct[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[22]); - ct[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].masterkey_blob[23]); + ct[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[20]); + ct[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[21]); + ct[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[22]); + ct[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].masterkey_blob[23]); u32 pt[4]; @@ -338,9 +338,9 @@ KERNEL_FQ void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_ if ((pt[2] == 0x0d0d0d0d) && (pt[3] == 0x0d0d0d0d)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m19000-pure.cl b/OpenCL/m19000-pure.cl index 6a2e8a343..2b69f1dab 100644 --- a/OpenCL/m19000-pure.cl +++ b/OpenCL/m19000-pure.cl @@ -31,7 +31,7 @@ KERNEL_FQ void m19000_init (KERN_ATTR_TMPS (qnx_md5_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -41,7 +41,7 @@ KERNEL_FQ void m19000_init (KERN_ATTR_TMPS (qnx_md5_tmp_t)) md5_init (&md5_ctx); - md5_update_global (&md5_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&md5_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_update_global (&md5_ctx, pws[gid].i, pws[gid].pw_len); @@ -56,11 +56,11 @@ KERNEL_FQ void m19000_loop (KERN_ATTR_TMPS (qnx_md5_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; md5_ctx_t md5_ctx = tmps[gid].md5_ctx; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { md5_update_global (&md5_ctx, pws[gid].i, pws[gid].pw_len); } @@ -77,7 +77,7 @@ KERNEL_FQ void m19000_comp (KERN_ATTR_TMPS (qnx_md5_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; md5_ctx_t md5_ctx = tmps[gid].md5_ctx; diff --git a/OpenCL/m19100-pure.cl b/OpenCL/m19100-pure.cl index 22839b3e9..ce4aec930 100644 --- a/OpenCL/m19100-pure.cl +++ b/OpenCL/m19100-pure.cl @@ -31,7 +31,7 @@ KERNEL_FQ void m19100_init (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -41,7 +41,7 @@ KERNEL_FQ void m19100_init (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) sha256_init (&sha256_ctx); - sha256_update_global_swap (&sha256_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&sha256_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&sha256_ctx, pws[gid].i, pws[gid].pw_len); @@ -56,11 +56,11 @@ KERNEL_FQ void m19100_loop (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t sha256_ctx = tmps[gid].sha256_ctx; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { sha256_update_global_swap (&sha256_ctx, pws[gid].i, pws[gid].pw_len); } @@ -77,7 +77,7 @@ KERNEL_FQ void m19100_comp (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_ctx_t sha256_ctx = tmps[gid].sha256_ctx; diff --git a/OpenCL/m19200-pure.cl b/OpenCL/m19200-pure.cl index e0119a294..66ae6a8c3 100644 --- a/OpenCL/m19200-pure.cl +++ b/OpenCL/m19200-pure.cl @@ -372,7 +372,7 @@ KERNEL_FQ void m19200_init (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -382,7 +382,7 @@ KERNEL_FQ void m19200_init (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) sha512_init (&sha512_ctx); - sha512_update_global_swap (&sha512_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&sha512_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&sha512_ctx, pws[gid].i, pws[gid].pw_len); @@ -398,12 +398,12 @@ KERNEL_FQ void m19200_loop (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t sha512_ctx = tmps[gid].sha512_ctx; u32 sav = tmps[gid].sav; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { sav = sha512_update_global_swap_qnxbug (&sha512_ctx, pws[gid].i, pws[gid].pw_len, sav); } @@ -421,7 +421,7 @@ KERNEL_FQ void m19200_comp (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t sha512_ctx = tmps[gid].sha512_ctx; diff --git a/OpenCL/m19300_a0-pure.cl b/OpenCL/m19300_a0-pure.cl index feebd1d57..fcd32d456 100644 --- a/OpenCL/m19300_a0-pure.cl +++ b/OpenCL/m19300_a0-pure.cl @@ -35,7 +35,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -43,26 +43,26 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) COPY_PW (pws[gid]); - const int salt2_len = esalt_bufs[DIGESTS_OFFSET].salt2_len; + const int salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; u32 s2[64] = { 0 }; for (int i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { - s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt2_buf[idx]); + s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -94,7 +94,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -102,10 +102,10 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -114,26 +114,26 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) COPY_PW (pws[gid]); - const int salt2_len = esalt_bufs[DIGESTS_OFFSET].salt2_len; + const int salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; u32 s2[64] = { 0 }; for (int i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { - s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt2_buf[idx]); + s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m19300_a1-pure.cl b/OpenCL/m19300_a1-pure.cl index 49ba11554..40d4ccc1c 100644 --- a/OpenCL/m19300_a1-pure.cl +++ b/OpenCL/m19300_a1-pure.cl @@ -33,26 +33,26 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_ESALT (sha1_double_salt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const int salt2_len = esalt_bufs[DIGESTS_OFFSET].salt2_len; + const int salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; u32 s2[64] = { 0 }; for (int i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { - s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt2_buf[idx]); + s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -60,7 +60,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_ESALT (sha1_double_salt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -88,7 +88,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_ESALT (sha1_double_salt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -96,30 +96,30 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_ESALT (sha1_double_salt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const int salt2_len = esalt_bufs[DIGESTS_OFFSET].salt2_len; + const int salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; u32 s2[64] = { 0 }; for (int i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { - s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt2_buf[idx]); + s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -127,7 +127,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_ESALT (sha1_double_salt_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m19300_a3-pure.cl b/OpenCL/m19300_a3-pure.cl index 14502004a..93d2105f8 100644 --- a/OpenCL/m19300_a3-pure.cl +++ b/OpenCL/m19300_a3-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -48,20 +48,20 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) w[idx] = pws[gid].i[idx]; } - const int salt2_len = esalt_bufs[DIGESTS_OFFSET].salt2_len; + const int salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; u32x s2[64] = { 0 }; for (int i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { - s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt2_buf[idx]); + s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); /** * loop @@ -69,7 +69,7 @@ KERNEL_FQ void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -105,7 +105,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -113,10 +113,10 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -132,20 +132,20 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) w[idx] = pws[gid].i[idx]; } - const int salt2_len = esalt_bufs[DIGESTS_OFFSET].salt2_len; + const int salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len; u32x s2[64] = { 0 }; for (int i = 0, idx = 0; i < salt2_len; i += 4, idx += 1) { - s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].salt2_buf[idx]); + s2[idx] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha1_update_global_swap (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); /** * loop @@ -153,7 +153,7 @@ KERNEL_FQ void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m19500_a0-pure.cl b/OpenCL/m19500_a0-pure.cl index dd0114567..ff9bfaaa9 100644 --- a/OpenCL/m19500_a0-pure.cl +++ b/OpenCL/m19500_a0-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,9 +73,9 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) COPY_PW (pws[gid]); - const int salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const int salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; - const int site_key_len = esalt_bufs[DIGESTS_OFFSET].site_key_len; + const int site_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].site_key_len; u32 s[64] = { 0 }; u32 k[64] = { 0 }; @@ -84,12 +84,12 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (esalt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].salt_buf[idx]); } for (int i = 0, idx = 0; i < site_key_len; i += 4, idx += 1) { - k[idx] = hc_swap32_S (esalt_bufs[SALT_POS].site_key_buf[idx]); + k[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].site_key_buf[idx]); } // precompute some stuff @@ -107,7 +107,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -200,7 +200,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -208,10 +208,10 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -220,9 +220,9 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) COPY_PW (pws[gid]); - const int salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const int salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; - const int site_key_len = esalt_bufs[DIGESTS_OFFSET].site_key_len; + const int site_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].site_key_len; u32 s[64] = { 0 }; u32 k[64] = { 0 }; @@ -231,12 +231,12 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (esalt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].salt_buf[idx]); } for (int i = 0, idx = 0; i < site_key_len; i += 4, idx += 1) { - k[idx] = hc_swap32_S (esalt_bufs[SALT_POS].site_key_buf[idx]); + k[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].site_key_buf[idx]); } // precompute some stuff @@ -254,7 +254,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m19500_a1-pure.cl b/OpenCL/m19500_a1-pure.cl index 97bfcff6f..059eb593b 100644 --- a/OpenCL/m19500_a1-pure.cl +++ b/OpenCL/m19500_a1-pure.cl @@ -63,15 +63,15 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const int salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const int salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; - const int site_key_len = esalt_bufs[DIGESTS_OFFSET].site_key_len; + const int site_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].site_key_len; u32 s[64] = { 0 }; u32 k[64] = { 0 }; @@ -80,12 +80,12 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (esalt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].salt_buf[idx]); } for (int i = 0, idx = 0; i < site_key_len; i += 4, idx += 1) { - k[idx] = hc_swap32_S (esalt_bufs[SALT_POS].site_key_buf[idx]); + k[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].site_key_buf[idx]); } // precompute some stuff @@ -104,7 +104,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -194,7 +194,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -202,19 +202,19 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const int salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const int salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; - const int site_key_len = esalt_bufs[DIGESTS_OFFSET].site_key_len; + const int site_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].site_key_len; u32 s[64] = { 0 }; u32 k[64] = { 0 }; @@ -223,12 +223,12 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (esalt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].salt_buf[idx]); } for (int i = 0, idx = 0; i < site_key_len; i += 4, idx += 1) { - k[idx] = hc_swap32_S (esalt_bufs[SALT_POS].site_key_buf[idx]); + k[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].site_key_buf[idx]); } // precompute some stuff @@ -247,7 +247,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m19500_a3-pure.cl b/OpenCL/m19500_a3-pure.cl index 13c8990f6..e43c916cf 100644 --- a/OpenCL/m19500_a3-pure.cl +++ b/OpenCL/m19500_a3-pure.cl @@ -63,7 +63,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -78,9 +78,9 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) w[idx] = pws[gid].i[idx]; } - const int salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const int salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; - const int site_key_len = esalt_bufs[DIGESTS_OFFSET].site_key_len; + const int site_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].site_key_len; u32 s[64] = { 0 }; u32 k[64] = { 0 }; @@ -89,12 +89,12 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (esalt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].salt_buf[idx]); } for (int i = 0, idx = 0; i < site_key_len; i += 4, idx += 1) { - k[idx] = hc_swap32_S (esalt_bufs[SALT_POS].site_key_buf[idx]); + k[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].site_key_buf[idx]); } // precompute some stuff @@ -114,7 +114,7 @@ KERNEL_FQ void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -209,7 +209,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -217,10 +217,10 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -236,9 +236,9 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) w[idx] = pws[gid].i[idx]; } - const int salt_len = esalt_bufs[DIGESTS_OFFSET].salt_len; + const int salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt_len; - const int site_key_len = esalt_bufs[DIGESTS_OFFSET].site_key_len; + const int site_key_len = esalt_bufs[DIGESTS_OFFSET_HOST].site_key_len; u32 s[64] = { 0 }; u32 k[64] = { 0 }; @@ -247,12 +247,12 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (esalt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].salt_buf[idx]); } for (int i = 0, idx = 0; i < site_key_len; i += 4, idx += 1) { - k[idx] = hc_swap32_S (esalt_bufs[SALT_POS].site_key_buf[idx]); + k[idx] = hc_swap32_S (esalt_bufs[SALT_POS_HOST].site_key_buf[idx]); } // precompute some stuff @@ -272,7 +272,7 @@ KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m19600-pure.cl b/OpenCL/m19600-pure.cl index e9a015e9a..a3d9383ec 100644 --- a/OpenCL/m19600-pure.cl +++ b/OpenCL/m19600-pure.cl @@ -123,7 +123,7 @@ KERNEL_FQ void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -147,7 +147,7 @@ KERNEL_FQ void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].account_info, esalt_bufs[DIGESTS_OFFSET].account_info_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].account_info, esalt_bufs[DIGESTS_OFFSET_HOST].account_info_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -200,7 +200,7 @@ KERNEL_FQ void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t */ const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -234,7 +234,7 @@ KERNEL_FQ void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -342,7 +342,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* at this point, the output ('seed') will be used to generate AES keys: @@ -446,29 +446,29 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t u32 decrypted_block[4]; - first_blocks[0] = esalt_bufs[DIGESTS_OFFSET].edata2[0]; - first_blocks[1] = esalt_bufs[DIGESTS_OFFSET].edata2[1]; - first_blocks[2] = esalt_bufs[DIGESTS_OFFSET].edata2[2]; - first_blocks[3] = esalt_bufs[DIGESTS_OFFSET].edata2[3]; + first_blocks[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[0]; + first_blocks[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[1]; + first_blocks[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[2]; + first_blocks[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[3]; - first_blocks[4] = esalt_bufs[DIGESTS_OFFSET].edata2[4]; // possible ASN1 structs - first_blocks[5] = esalt_bufs[DIGESTS_OFFSET].edata2[5]; - first_blocks[6] = esalt_bufs[DIGESTS_OFFSET].edata2[6]; // possible ASN1 structs - first_blocks[7] = esalt_bufs[DIGESTS_OFFSET].edata2[7]; + first_blocks[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[4]; // possible ASN1 structs + first_blocks[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[5]; + first_blocks[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[6]; // possible ASN1 structs + first_blocks[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[7]; /* we will decrypt them here in order to be able to compute hmac directly if ASN1 structs were to be found */ - first_blocks[8] = esalt_bufs[DIGESTS_OFFSET].edata2[8]; - first_blocks[9] = esalt_bufs[DIGESTS_OFFSET].edata2[9]; - first_blocks[10] = esalt_bufs[DIGESTS_OFFSET].edata2[10]; - first_blocks[11] = esalt_bufs[DIGESTS_OFFSET].edata2[11]; + first_blocks[8] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[8]; + first_blocks[9] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[9]; + first_blocks[10] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[10]; + first_blocks[11] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[11]; - first_blocks[12] = esalt_bufs[DIGESTS_OFFSET].edata2[12]; - first_blocks[13] = esalt_bufs[DIGESTS_OFFSET].edata2[13]; - first_blocks[14] = esalt_bufs[DIGESTS_OFFSET].edata2[14]; - first_blocks[15] = esalt_bufs[DIGESTS_OFFSET].edata2[15]; + first_blocks[12] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[12]; + first_blocks[13] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[13]; + first_blocks[14] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[14]; + first_blocks[15] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[15]; u32 w0[4]; u32 w1[4]; @@ -505,7 +505,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t // now we decrypt all the ticket to verify checksum int block_position; - int edata2_len = esalt_bufs[DIGESTS_OFFSET].edata2_len; + int edata2_len = esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len; int edata2_left; @@ -580,22 +580,22 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t // first 4 blocks are already decrypted for (edata2_left = need - 64; edata2_left >= 64; edata2_left -= 64) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; - block[4] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 4]; - block[5] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 5]; - block[6] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 6]; - block[7] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 7]; - block[8] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 8]; - block[9] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 9]; - block[10] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 10]; - block[11] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 11]; - block[12] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 12]; - block[13] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 13]; - block[14] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 14]; - block[15] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 15]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; + block[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 4]; + block[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 5]; + block[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 6]; + block[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 7]; + block[8] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 8]; + block[9] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 9]; + block[10] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 10]; + block[11] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 11]; + block[12] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 12]; + block[13] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 13]; + block[14] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 14]; + block[15] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 15]; aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -632,10 +632,10 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t if (edata2_left == 16) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -665,14 +665,14 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t } else if (edata2_left == 32) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; - block[4] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 4]; - block[5] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 5]; - block[6] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 6]; - block[7] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 7]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; + block[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 4]; + block[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 5]; + block[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 6]; + block[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 7]; aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -704,18 +704,18 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t } else if (edata2_left == 48) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; - block[4] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 4]; - block[5] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 5]; - block[6] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 6]; - block[7] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 7]; - block[8] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 8]; - block[9] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 9]; - block[10] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 10]; - block[11] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 11]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; + block[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 4]; + block[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 5]; + block[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 6]; + block[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 7]; + block[8] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 8]; + block[9] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 9]; + block[10] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 10]; + block[11] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 11]; aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -756,16 +756,16 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t // this is block n-2, it will be xored with the n-1 block later crafted u32 last_block_cbc[4]; - last_block_cbc[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 0]; - last_block_cbc[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 1]; - last_block_cbc[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 2]; - last_block_cbc[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 3]; + last_block_cbc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 0]; + last_block_cbc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 1]; + last_block_cbc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 2]; + last_block_cbc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 3]; // n-1 block is decrypted separately from the previous blocks which were cbc decrypted - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; aes128_decrypt (aes_cts_decrypt_ks, block, decrypted_block, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -806,7 +806,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t { case 0: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; mask = (0xffffffff >> ((4 - last_block_size) * 8)); @@ -821,7 +821,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t case 1: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; if (shift == 0) { @@ -835,7 +835,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t } else { - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); @@ -854,8 +854,8 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t case 2: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; if (shift == 0) { @@ -872,7 +872,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t } else { - last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; + last_block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 2]; mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); @@ -893,9 +893,9 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t case 3: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 2]; if (shift == 0) { @@ -914,7 +914,7 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t } else { - last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3]; + last_block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 3]; mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); @@ -937,10 +937,10 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t case 4: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; - last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 2]; + last_block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 3]; n_1_crafted[0] = last_block[0]; n_1_crafted[1] = last_block[1]; @@ -995,14 +995,14 @@ KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t sha1_hmac_final (&sha1_hmac_ctx); - if (sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET].checksum[0] - && sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET].checksum[1] - && sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET].checksum[2]) + if (sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0] + && sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1] + && sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { #define il_pos 0 - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m19700-pure.cl b/OpenCL/m19700-pure.cl index f59bd62ca..5879697b0 100644 --- a/OpenCL/m19700-pure.cl +++ b/OpenCL/m19700-pure.cl @@ -123,7 +123,7 @@ KERNEL_FQ void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -147,7 +147,7 @@ KERNEL_FQ void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].account_info, esalt_bufs[DIGESTS_OFFSET].account_info_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].account_info, esalt_bufs[DIGESTS_OFFSET_HOST].account_info_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -200,7 +200,7 @@ KERNEL_FQ void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t */ const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -234,7 +234,7 @@ KERNEL_FQ void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -342,7 +342,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* at this point, the output ('seed') will be used to generate AES keys: @@ -506,29 +506,29 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t u32 decrypted_block[8]; - first_blocks[0] = esalt_bufs[DIGESTS_OFFSET].edata2[0]; - first_blocks[1] = esalt_bufs[DIGESTS_OFFSET].edata2[1]; - first_blocks[2] = esalt_bufs[DIGESTS_OFFSET].edata2[2]; - first_blocks[3] = esalt_bufs[DIGESTS_OFFSET].edata2[3]; + first_blocks[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[0]; + first_blocks[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[1]; + first_blocks[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[2]; + first_blocks[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[3]; - first_blocks[4] = esalt_bufs[DIGESTS_OFFSET].edata2[4]; // possible ASN1 structs - first_blocks[5] = esalt_bufs[DIGESTS_OFFSET].edata2[5]; - first_blocks[6] = esalt_bufs[DIGESTS_OFFSET].edata2[6]; // possible ASN1 structs - first_blocks[7] = esalt_bufs[DIGESTS_OFFSET].edata2[7]; + first_blocks[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[4]; // possible ASN1 structs + first_blocks[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[5]; + first_blocks[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[6]; // possible ASN1 structs + first_blocks[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[7]; /* we will decrypt them here in order to be able to compute hmac directly if ASN1 structs were to be found */ - first_blocks[8] = esalt_bufs[DIGESTS_OFFSET].edata2[8]; - first_blocks[9] = esalt_bufs[DIGESTS_OFFSET].edata2[9]; - first_blocks[10] = esalt_bufs[DIGESTS_OFFSET].edata2[10]; - first_blocks[11] = esalt_bufs[DIGESTS_OFFSET].edata2[11]; + first_blocks[8] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[8]; + first_blocks[9] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[9]; + first_blocks[10] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[10]; + first_blocks[11] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[11]; - first_blocks[12] = esalt_bufs[DIGESTS_OFFSET].edata2[12]; - first_blocks[13] = esalt_bufs[DIGESTS_OFFSET].edata2[13]; - first_blocks[14] = esalt_bufs[DIGESTS_OFFSET].edata2[14]; - first_blocks[15] = esalt_bufs[DIGESTS_OFFSET].edata2[15]; + first_blocks[12] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[12]; + first_blocks[13] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[13]; + first_blocks[14] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[14]; + first_blocks[15] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[15]; u32 w0[4]; u32 w1[4]; @@ -582,7 +582,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t int block_position; - int edata2_len = esalt_bufs[DIGESTS_OFFSET].edata2_len; + int edata2_len = esalt_bufs[DIGESTS_OFFSET_HOST].edata2_len; int edata2_left; @@ -642,22 +642,22 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t // first 4 blocks are already decrypted for (edata2_left = need - 64; edata2_left >= 64; edata2_left -= 64) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; - block[4] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 4]; - block[5] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 5]; - block[6] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 6]; - block[7] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 7]; - block[8] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 8]; - block[9] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 9]; - block[10] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 10]; - block[11] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 11]; - block[12] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 12]; - block[13] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 13]; - block[14] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 14]; - block[15] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 15]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; + block[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 4]; + block[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 5]; + block[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 6]; + block[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 7]; + block[8] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 8]; + block[9] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 9]; + block[10] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 10]; + block[11] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 11]; + block[12] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 12]; + block[13] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 13]; + block[14] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 14]; + block[15] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 15]; aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -695,10 +695,10 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t if (edata2_left == 16) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -728,14 +728,14 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t } else if (edata2_left == 32) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; - block[4] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 4]; - block[5] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 5]; - block[6] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 6]; - block[7] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 7]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; + block[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 4]; + block[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 5]; + block[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 6]; + block[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 7]; aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -767,18 +767,18 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t } else if (edata2_left == 48) { - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; - block[4] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 4]; - block[5] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 5]; - block[6] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 6]; - block[7] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 7]; - block[8] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 8]; - block[9] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 9]; - block[10] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 10]; - block[11] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 11]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; + block[4] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 4]; + block[5] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 5]; + block[6] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 6]; + block[7] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 7]; + block[8] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 8]; + block[9] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 9]; + block[10] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 10]; + block[11] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 11]; aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -819,16 +819,16 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t // this is block n-2, it will be xored with the n-1 block later crafted u32 last_block_cbc[4]; - last_block_cbc[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 0]; - last_block_cbc[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 1]; - last_block_cbc[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 2]; - last_block_cbc[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_cbc_position + 3]; + last_block_cbc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 0]; + last_block_cbc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 1]; + last_block_cbc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 2]; + last_block_cbc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_cbc_position + 3]; // n-1 block is decrypted separately from the previous blocks which were cbc decrypted - block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 0]; - block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 1]; - block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 2]; - block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[block_position + 3]; + block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 0]; + block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 1]; + block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 2]; + block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[block_position + 3]; aes256_decrypt (aes_cts_decrypt_ks, block, decrypted_block, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -869,7 +869,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t { case 0: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; mask = (0xffffffff >> ((4 - last_block_size) * 8)); @@ -884,7 +884,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t case 1: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; if (shift == 0) { @@ -898,7 +898,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t } else { - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); @@ -917,8 +917,8 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t case 2: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; if (shift == 0) { @@ -935,7 +935,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t } else { - last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; + last_block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 2]; mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); @@ -956,9 +956,9 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t case 3: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 2]; if (shift == 0) { @@ -977,7 +977,7 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t } else { - last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3]; + last_block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 3]; mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); @@ -1000,10 +1000,10 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t case 4: - last_block[0] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 2]; - last_block[3] = esalt_bufs[DIGESTS_OFFSET].edata2[last_block_position + 3]; + last_block[0] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 2]; + last_block[3] = esalt_bufs[DIGESTS_OFFSET_HOST].edata2[last_block_position + 3]; n_1_crafted[0] = last_block[0]; n_1_crafted[1] = last_block[1]; @@ -1059,14 +1059,14 @@ KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t sha1_hmac_final (&sha1_hmac_ctx); - if (sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET].checksum[0] - && sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET].checksum[1] - && sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET].checksum[2]) + if (sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0] + && sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1] + && sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2]) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { #define il_pos 0 - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m19800-pure.cl b/OpenCL/m19800-pure.cl index 080241af6..ee249576e 100644 --- a/OpenCL/m19800-pure.cl +++ b/OpenCL/m19800-pure.cl @@ -123,7 +123,7 @@ KERNEL_FQ void m19800_init (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -147,7 +147,7 @@ KERNEL_FQ void m19800_init (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].account_info, esalt_bufs[DIGESTS_OFFSET].account_info_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].account_info, esalt_bufs[DIGESTS_OFFSET_HOST].account_info_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -200,7 +200,7 @@ KERNEL_FQ void m19800_loop (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) */ const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -234,7 +234,7 @@ KERNEL_FQ void m19800_loop (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -342,7 +342,7 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* at this point, the output ('seed') will be used to generate AES keys: @@ -424,16 +424,16 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) u32 decrypted_block[4]; // c_0 - enc_blocks[0] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[0]; - enc_blocks[1] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[1]; - enc_blocks[2] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[2]; - enc_blocks[3] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[3]; + enc_blocks[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[0]; + enc_blocks[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[1]; + enc_blocks[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[2]; + enc_blocks[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[3]; // c_1 aka c_n-1 since there are guaranteed to be exactly 3 blocks - enc_blocks[4] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[4]; - enc_blocks[5] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[5]; - enc_blocks[6] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[6]; - enc_blocks[7] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[7]; + enc_blocks[4] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[4]; + enc_blocks[5] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[5]; + enc_blocks[6] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[6]; + enc_blocks[7] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[7]; u32 w0[4]; u32 w1[4]; @@ -445,10 +445,10 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) AES128_set_decrypt_key (aes_cts_decrypt_ks, ke, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); // Our first decryption is the last block (currently in c_n-1) using the first portion of (c_n) as our IV, this allows us to get plaintext in one crypto operation - aes_iv[0] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[ 8]; - aes_iv[1] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[ 9]; - aes_iv[2] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[10]; - aes_iv[3] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[11]; + aes_iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[ 8]; + aes_iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[ 9]; + aes_iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[10]; + aes_iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[11]; aes128_decrypt_cbc (aes_cts_decrypt_ks, enc_blocks + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -468,7 +468,7 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) w0[2] = decrypted_block[2]; w0[3] = decrypted_block[3]; - int enc_timestamp_len = esalt_bufs[DIGESTS_OFFSET].enc_timestamp_len; + int enc_timestamp_len = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp_len; int last_word_position = enc_timestamp_len / 4; // New c_1, join c_n with result of the decrypted c_n-1 @@ -478,7 +478,7 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) { if (last_word_position > last_block_iter + 4) { - enc_blocks[last_block_iter] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4]; + enc_blocks[last_block_iter] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4]; } else if (last_word_position == last_block_iter + 4) { @@ -486,13 +486,13 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) switch (enc_timestamp_len % 4) { case 1: - enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4] & 0x000000ff) | (w0[last_block_iter - 4] & 0xffffff00); + enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4] & 0x000000ff) | (w0[last_block_iter - 4] & 0xffffff00); break; case 2: - enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4] & 0x0000ffff) | (w0[last_block_iter - 4] & 0xffff0000); + enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4] & 0x0000ffff) | (w0[last_block_iter - 4] & 0xffff0000); break; case 3: - enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4] & 0x00ffffff) | (w0[last_block_iter - 4] & 0xff000000); + enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4] & 0x00ffffff) | (w0[last_block_iter - 4] & 0xff000000); break; default: enc_blocks[last_block_iter] = w0[last_block_iter - 4]; @@ -505,10 +505,10 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) } // c_2 aka c_n which is now equal to the old c_n-1 - enc_blocks[8] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[4]; - enc_blocks[9] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[5]; - enc_blocks[10] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[6]; - enc_blocks[11] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[7]; + enc_blocks[8] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[4]; + enc_blocks[9] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[5]; + enc_blocks[10] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[6]; + enc_blocks[11] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[7]; // Go ahead and decrypt all blocks now as a normal AES CBC operation aes_iv[0] = 0; aes_iv[1] = 0; @@ -605,15 +605,15 @@ KERNEL_FQ void m19800_comp (KERN_ATTR_TMPS_ESALT (krb5pa_17_tmp_t, krb5pa_17_t)) sha1_hmac_final (&sha1_hmac_ctx); // Compare checksum - if ((sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET].checksum[0]) - && (sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET].checksum[1]) - && (sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET].checksum[2])) + if ((sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]) + && (sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]) + && (sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2])) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { #define il_pos 0 - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m19900-pure.cl b/OpenCL/m19900-pure.cl index acee3d519..3715a8d71 100644 --- a/OpenCL/m19900-pure.cl +++ b/OpenCL/m19900-pure.cl @@ -123,7 +123,7 @@ KERNEL_FQ void m19900_init (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main @@ -147,7 +147,7 @@ KERNEL_FQ void m19900_init (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].account_info, esalt_bufs[DIGESTS_OFFSET].account_info_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].account_info, esalt_bufs[DIGESTS_OFFSET_HOST].account_info_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -201,7 +201,7 @@ KERNEL_FQ void m19900_loop (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -235,7 +235,7 @@ KERNEL_FQ void m19900_loop (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -343,7 +343,7 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* at this point, the output ('seed') will be used to generate AES keys: @@ -453,16 +453,16 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) u32 decrypted_block[4]; // c_0 - enc_blocks[0] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[0]; - enc_blocks[1] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[1]; - enc_blocks[2] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[2]; - enc_blocks[3] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[3]; + enc_blocks[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[0]; + enc_blocks[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[1]; + enc_blocks[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[2]; + enc_blocks[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[3]; // c_1 aka c_n-1 since there are guaranteed to be exactly 3 blocks - enc_blocks[4] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[4]; - enc_blocks[5] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[5]; - enc_blocks[6] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[6]; - enc_blocks[7] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[7]; + enc_blocks[4] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[4]; + enc_blocks[5] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[5]; + enc_blocks[6] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[6]; + enc_blocks[7] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[7]; u32 w0[4]; u32 w1[4]; @@ -474,10 +474,10 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) AES256_set_decrypt_key (aes_cts_decrypt_ks, ke, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); // Our first decryption is the last block (currently in c_n-1) using the first portion of (c_n) as our IV, this allows us to get plaintext in one crypto operation - aes_iv[0] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[8]; - aes_iv[1] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[9]; - aes_iv[2] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[10]; - aes_iv[3] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[11]; + aes_iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[8]; + aes_iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[9]; + aes_iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[10]; + aes_iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[11]; aes256_decrypt_cbc (aes_cts_decrypt_ks, enc_blocks + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -497,7 +497,7 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) w0[2] = decrypted_block[2]; w0[3] = decrypted_block[3]; - int enc_timestamp_len = esalt_bufs[DIGESTS_OFFSET].enc_timestamp_len; + int enc_timestamp_len = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp_len; int last_word_position = enc_timestamp_len / 4; // New c_1, join c_n with result of the decrypted c_n-1 @@ -507,7 +507,7 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) { if (last_word_position > last_block_iter + 4) { - enc_blocks[last_block_iter] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4]; + enc_blocks[last_block_iter] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4]; } else if (last_word_position == last_block_iter + 4) { @@ -515,13 +515,13 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) switch (enc_timestamp_len % 4) { case 1: - enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4] & 0x000000ff) | (w0[last_block_iter - 4] & 0xffffff00); + enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4] & 0x000000ff) | (w0[last_block_iter - 4] & 0xffffff00); break; case 2: - enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4] & 0x0000ffff) | (w0[last_block_iter - 4] & 0xffff0000); + enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4] & 0x0000ffff) | (w0[last_block_iter - 4] & 0xffff0000); break; case 3: - enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET].enc_timestamp[last_block_iter + 4] & 0x00ffffff) | (w0[last_block_iter - 4] & 0xff000000); + enc_blocks[last_block_iter] = (esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[last_block_iter + 4] & 0x00ffffff) | (w0[last_block_iter - 4] & 0xff000000); break; default: enc_blocks[last_block_iter] = w0[last_block_iter - 4]; @@ -534,10 +534,10 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) } // c_2 aka c_n which is now equal to the old c_n-1 - enc_blocks[ 8] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[4]; - enc_blocks[ 9] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[5]; - enc_blocks[10] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[6]; - enc_blocks[11] = esalt_bufs[DIGESTS_OFFSET].enc_timestamp[7]; + enc_blocks[ 8] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[4]; + enc_blocks[ 9] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[5]; + enc_blocks[10] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[6]; + enc_blocks[11] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_timestamp[7]; // Go ahead and decrypt all blocks now as a normal AES CBC operation aes_iv[0] = 0; @@ -647,15 +647,15 @@ KERNEL_FQ void m19900_comp (KERN_ATTR_TMPS_ESALT (krb5pa_18_tmp_t, krb5pa_18_t)) sha1_hmac_final (&sha1_hmac_ctx); // Compare checksum - if ((sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET].checksum[0]) - && (sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET].checksum[1]) - && (sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET].checksum[2])) + if ((sha1_hmac_ctx.opad.h[0] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[0]) + && (sha1_hmac_ctx.opad.h[1] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[1]) + && (sha1_hmac_ctx.opad.h[2] == esalt_bufs[DIGESTS_OFFSET_HOST].checksum[2])) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { #define il_pos 0 - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m20011-pure.cl b/OpenCL/m20011-pure.cl index 9eeaade86..c8adea625 100644 --- a/OpenCL/m20011-pure.cl +++ b/OpenCL/m20011-pure.cl @@ -100,7 +100,7 @@ KERNEL_FQ void m20011_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -124,7 +124,7 @@ KERNEL_FQ void m20011_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -200,7 +200,7 @@ KERNEL_FQ void m20011_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -246,7 +246,7 @@ KERNEL_FQ void m20011_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -379,7 +379,7 @@ KERNEL_FQ void m20011_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define il_pos 0 @@ -405,27 +405,27 @@ KERNEL_FQ void m20011_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt ukey2[6] = hc_swap32_S (h32_from_64_S (tmps[gid].out[7])); ukey2[7] = hc_swap32_S (l32_from_64_S (tmps[gid].out[7])); - if (dcrp_verify_header_serpent (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2) == 1) + if (dcrp_verify_header_serpent (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_twofish (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2) == 1) + if (dcrp_verify_header_twofish (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_aes (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_aes (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m20012-pure.cl b/OpenCL/m20012-pure.cl index ff7879dcc..578716a5b 100644 --- a/OpenCL/m20012-pure.cl +++ b/OpenCL/m20012-pure.cl @@ -100,7 +100,7 @@ KERNEL_FQ void m20012_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -124,7 +124,7 @@ KERNEL_FQ void m20012_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 16; i += 8, j += 1) { @@ -200,7 +200,7 @@ KERNEL_FQ void m20012_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -246,7 +246,7 @@ KERNEL_FQ void m20012_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -379,7 +379,7 @@ KERNEL_FQ void m20012_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define il_pos 0 @@ -405,27 +405,27 @@ KERNEL_FQ void m20012_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt ukey2[6] = hc_swap32_S (h32_from_64_S (tmps[gid].out[7])); ukey2[7] = hc_swap32_S (l32_from_64_S (tmps[gid].out[7])); - if (dcrp_verify_header_serpent (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2) == 1) + if (dcrp_verify_header_serpent (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_twofish (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2) == 1) + if (dcrp_verify_header_twofish (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_aes (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_aes (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } @@ -451,27 +451,27 @@ KERNEL_FQ void m20012_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt ukey4[6] = hc_swap32_S (h32_from_64_S (tmps[gid].out[15])); ukey4[7] = hc_swap32_S (l32_from_64_S (tmps[gid].out[15])); - if (dcrp_verify_header_serpent_aes (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_serpent_aes (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_twofish_serpent (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4) == 1) + if (dcrp_verify_header_twofish_serpent (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_aes_twofish (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_aes_twofish (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m20013-pure.cl b/OpenCL/m20013-pure.cl index 3ee6108fc..0cc495ada 100644 --- a/OpenCL/m20013-pure.cl +++ b/OpenCL/m20013-pure.cl @@ -100,7 +100,7 @@ KERNEL_FQ void m20013_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -124,7 +124,7 @@ KERNEL_FQ void m20013_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 24; i += 8, j += 1) { @@ -200,7 +200,7 @@ KERNEL_FQ void m20013_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -246,7 +246,7 @@ KERNEL_FQ void m20013_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -379,7 +379,7 @@ KERNEL_FQ void m20013_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; #define il_pos 0 @@ -405,27 +405,27 @@ KERNEL_FQ void m20013_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt ukey2[6] = hc_swap32_S (h32_from_64_S (tmps[gid].out[7])); ukey2[7] = hc_swap32_S (l32_from_64_S (tmps[gid].out[7])); - if (dcrp_verify_header_serpent (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2) == 1) + if (dcrp_verify_header_serpent (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_twofish (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2) == 1) + if (dcrp_verify_header_twofish (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_aes (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_aes (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } @@ -451,27 +451,27 @@ KERNEL_FQ void m20013_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt ukey4[6] = hc_swap32_S (h32_from_64_S (tmps[gid].out[15])); ukey4[7] = hc_swap32_S (l32_from_64_S (tmps[gid].out[15])); - if (dcrp_verify_header_serpent_aes (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_serpent_aes (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_twofish_serpent (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4) == 1) + if (dcrp_verify_header_twofish_serpent (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_aes_twofish (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_aes_twofish (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } @@ -497,19 +497,19 @@ KERNEL_FQ void m20013_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, diskcrypt ukey6[6] = hc_swap32_S (h32_from_64_S (tmps[gid].out[23])); ukey6[7] = hc_swap32_S (l32_from_64_S (tmps[gid].out[23])); - if (dcrp_verify_header_serpent_twofish_aes (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4, ukey5, ukey6, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_serpent_twofish_aes (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4, ukey5, ukey6, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } - if (dcrp_verify_header_aes_twofish_serpent (digests_buf[DIGESTS_OFFSET].digest_buf, ukey1, ukey2, ukey3, ukey4, ukey5, ukey6, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) + if (dcrp_verify_header_aes_twofish_serpent (digests_buf[DIGESTS_OFFSET_HOST].digest_buf, ukey1, ukey2, ukey3, ukey4, ukey5, ukey6, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m20500_a0-pure.cl b/OpenCL/m20500_a0-pure.cl index 2a9ca70ed..185ba610a 100644 --- a/OpenCL/m20500_a0-pure.cl +++ b/OpenCL/m20500_a0-pure.cl @@ -174,7 +174,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -182,9 +182,9 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], 0 }; @@ -198,7 +198,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_RULES ()) * loop */ - 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) { pw_t t = PASTE_PW; @@ -248,7 +248,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -260,7 +260,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_RULES ()) * loop */ - 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) { pw_t t = PASTE_PW; diff --git a/OpenCL/m20500_a1-pure.cl b/OpenCL/m20500_a1-pure.cl index c03b3c2fc..7166c268b 100644 --- a/OpenCL/m20500_a1-pure.cl +++ b/OpenCL/m20500_a1-pure.cl @@ -172,7 +172,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -180,9 +180,9 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], 0 }; @@ -202,7 +202,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_BASIC ()) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - 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) { u32x key0 = key0init; u32x key1 = key1init; @@ -248,7 +248,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -256,9 +256,9 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], 0 }; @@ -278,7 +278,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_BASIC ()) if (pws[gid].pw_len >= (i + 4)) update_key012 (key0init, key1init, key2init, unpack_v8d_from_v32_S (pws[gid].i[j]), l_crc32tab); } - 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) { u32x key0 = key0init; u32x key1 = key1init; diff --git a/OpenCL/m20500_a3-pure.cl b/OpenCL/m20500_a3-pure.cl index 6adec0dc1..2cf9c4787 100644 --- a/OpenCL/m20500_a3-pure.cl +++ b/OpenCL/m20500_a3-pure.cl @@ -268,7 +268,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -292,9 +292,9 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_VECTOR ()) * reverse */ - u32 prep0 = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 prep1 = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 prep2 = digests_buf[DIGESTS_OFFSET].digest_buf[2]; + u32 prep0 = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 prep1 = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 prep2 = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; for (int pos = pw_len - 1; pos >= 4; pos--) { @@ -317,7 +317,7 @@ KERNEL_FQ void m20500_sxx (KERN_ATTR_VECTOR ()) u32 w0l = pws[gid].i[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -382,7 +382,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -403,7 +403,7 @@ KERNEL_FQ void m20500_mxx (KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m20510_a0-pure.cl b/OpenCL/m20510_a0-pure.cl index 05339048c..6626c4e04 100644 --- a/OpenCL/m20510_a0-pure.cl +++ b/OpenCL/m20510_a0-pure.cl @@ -511,7 +511,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -535,15 +535,15 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_RULES ()) * reverse */ - u32 prep0 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[0]); - u32 prep1 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[1]); - u32 prep2 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[2]); + u32 prep0 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]); + u32 prep1 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]); + u32 prep2 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]); /** * loop */ - 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) { pw_t t = PASTE_PW; diff --git a/OpenCL/m20510_a1-pure.cl b/OpenCL/m20510_a1-pure.cl index 0b3f3074d..23568d728 100644 --- a/OpenCL/m20510_a1-pure.cl +++ b/OpenCL/m20510_a1-pure.cl @@ -509,7 +509,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -527,9 +527,9 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_BASIC ()) * reverse */ - u32 prep0 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[0]); - u32 prep1 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[1]); - u32 prep2 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[2]); + u32 prep0 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]); + u32 prep1 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]); + u32 prep2 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]); /** * loop @@ -544,7 +544,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_BASIC ()) w[idx] = pws[gid].i[idx]; } - 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) { u32x key0 = prep0; u32x key1 = prep1; diff --git a/OpenCL/m20510_a3-pure.cl b/OpenCL/m20510_a3-pure.cl index 027220e29..1ab821259 100644 --- a/OpenCL/m20510_a3-pure.cl +++ b/OpenCL/m20510_a3-pure.cl @@ -509,7 +509,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -533,9 +533,9 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_VECTOR ()) * reverse */ - u32 prep0 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[0]); - u32 prep1 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[1]); - u32 prep2 = hc_swap32_S (digests_buf[DIGESTS_OFFSET].digest_buf[2]); + u32 prep0 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]); + u32 prep1 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]); + u32 prep2 = hc_swap32_S (digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]); for (int pos = pw_len - 1; pos >= 4; pos--) { @@ -550,7 +550,7 @@ KERNEL_FQ void m20510_sxx (KERN_ATTR_VECTOR ()) u32 w0l = pws[gid].i[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m20600-pure.cl b/OpenCL/m20600-pure.cl index 25f4f39fd..5930fd72d 100644 --- a/OpenCL/m20600-pure.cl +++ b/OpenCL/m20600-pure.cl @@ -33,7 +33,7 @@ KERNEL_FQ void m20600_init (KERN_ATTR_TMPS (omt_sha256_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * init @@ -43,7 +43,7 @@ KERNEL_FQ void m20600_init (KERN_ATTR_TMPS (omt_sha256_tmp_t)) sha256_init (&sha256_ctx); - sha256_update_global_swap (&sha256_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&sha256_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&sha256_ctx, pws[gid].i, pws[gid].pw_len); @@ -67,7 +67,7 @@ KERNEL_FQ void m20600_loop (KERN_ATTR_TMPS (omt_sha256_tmp_t)) const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; /** * init @@ -102,7 +102,7 @@ KERNEL_FQ void m20600_loop (KERN_ATTR_TMPS (omt_sha256_tmp_t)) w3[2] = 0; w3[3] = 32 * 8; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { w0[0] = digest[0]; w0[1] = digest[1]; @@ -144,7 +144,7 @@ KERNEL_FQ void m20600_comp (KERN_ATTR_TMPS (omt_sha256_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest diff --git a/OpenCL/m20710_a0-optimized.cl b/OpenCL/m20710_a0-optimized.cl index 2370ab876..0a9822a96 100644 --- a/OpenCL/m20710_a0-optimized.cl +++ b/OpenCL/m20710_a0-optimized.cl @@ -69,7 +69,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -98,30 +98,30 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -655,7 +655,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -684,24 +684,24 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -709,17 +709,17 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m20710_a0-pure.cl b/OpenCL/m20710_a0-pure.cl index e67d37f1a..8b41613bc 100644 --- a/OpenCL/m20710_a0-pure.cl +++ b/OpenCL/m20710_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,20 +68,20 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -167,7 +167,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -192,20 +192,20 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m20710_a1-optimized.cl b/OpenCL/m20710_a1-optimized.cl index 2b9b6b6fe..b246c514f 100644 --- a/OpenCL/m20710_a1-optimized.cl +++ b/OpenCL/m20710_a1-optimized.cl @@ -67,7 +67,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -96,30 +96,30 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -157,7 +157,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -711,7 +711,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -740,24 +740,24 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -765,17 +765,17 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -813,7 +813,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m20710_a1-pure.cl b/OpenCL/m20710_a1-pure.cl index 71489010b..1fe69ce69 100644 --- a/OpenCL/m20710_a1-pure.cl +++ b/OpenCL/m20710_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -66,11 +66,11 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_BASIC ()) u32 s[64] = { 0 }; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx1; @@ -83,7 +83,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; @@ -163,7 +163,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -171,10 +171,10 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,13 +186,13 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx1; @@ -205,7 +205,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; diff --git a/OpenCL/m20710_a3-optimized.cl b/OpenCL/m20710_a3-optimized.cl index facce2424..e8584bbb6 100644 --- a/OpenCL/m20710_a3-optimized.cl +++ b/OpenCL/m20710_a3-optimized.cl @@ -58,24 +58,24 @@ DECLSPEC void m20710m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -83,7 +83,7 @@ DECLSPEC void m20710m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -592,10 +592,10 @@ DECLSPEC void m20710s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -607,24 +607,24 @@ DECLSPEC void m20710s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5]); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6]); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7]); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); - salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[13]); - salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[14]); - salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[15]); - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5]); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6]); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7]); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + salt_buf2[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + salt_buf3[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); + salt_buf3[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[13]); + salt_buf3[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[14]); + salt_buf3[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[15]); + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop @@ -632,7 +632,7 @@ DECLSPEC void m20710s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -1156,7 +1156,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1187,7 +1187,7 @@ KERNEL_FQ void m20710_m04 (KERN_ATTR_VECTOR ()) * main */ - m20710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20710_m08 (KERN_ATTR_VECTOR ()) @@ -1217,7 +1217,7 @@ KERNEL_FQ void m20710_m08 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1248,7 +1248,7 @@ KERNEL_FQ void m20710_m08 (KERN_ATTR_VECTOR ()) * main */ - m20710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20710_m16 (KERN_ATTR_VECTOR ()) @@ -1278,7 +1278,7 @@ KERNEL_FQ void m20710_m16 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1309,7 +1309,7 @@ KERNEL_FQ void m20710_m16 (KERN_ATTR_VECTOR ()) * main */ - m20710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20710_s04 (KERN_ATTR_VECTOR ()) @@ -1339,7 +1339,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1370,7 +1370,7 @@ KERNEL_FQ void m20710_s04 (KERN_ATTR_VECTOR ()) * main */ - m20710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20710_s08 (KERN_ATTR_VECTOR ()) @@ -1400,7 +1400,7 @@ KERNEL_FQ void m20710_s08 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1431,7 +1431,7 @@ KERNEL_FQ void m20710_s08 (KERN_ATTR_VECTOR ()) * main */ - m20710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20710_s16 (KERN_ATTR_VECTOR ()) @@ -1461,7 +1461,7 @@ KERNEL_FQ void m20710_s16 (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1492,5 +1492,5 @@ KERNEL_FQ void m20710_s16 (KERN_ATTR_VECTOR ()) * main */ - m20710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m20710_a3-pure.cl b/OpenCL/m20710_a3-pure.cl index 56dca7ddc..4f009312d 100644 --- a/OpenCL/m20710_a3-pure.cl +++ b/OpenCL/m20710_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,13 +73,13 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -88,7 +88,7 @@ KERNEL_FQ void m20710_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -176,7 +176,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -184,10 +184,10 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -208,13 +208,13 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -223,7 +223,7 @@ KERNEL_FQ void m20710_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m20720_a0-pure.cl b/OpenCL/m20720_a0-pure.cl index 2ef382f20..dc8a007cf 100644 --- a/OpenCL/m20720_a0-pure.cl +++ b/OpenCL/m20720_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,20 +68,20 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -167,7 +167,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -192,20 +192,20 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m20720_a1-pure.cl b/OpenCL/m20720_a1-pure.cl index f66d28bf7..df3cf63f9 100644 --- a/OpenCL/m20720_a1-pure.cl +++ b/OpenCL/m20720_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -66,11 +66,11 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_BASIC ()) u32 s[64] = { 0 }; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx1; @@ -83,7 +83,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; @@ -163,7 +163,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -171,10 +171,10 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -186,13 +186,13 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx1; @@ -205,7 +205,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; diff --git a/OpenCL/m20720_a3-pure.cl b/OpenCL/m20720_a3-pure.cl index 3316e54b8..98e7dcb35 100644 --- a/OpenCL/m20720_a3-pure.cl +++ b/OpenCL/m20720_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,13 +73,13 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -88,7 +88,7 @@ KERNEL_FQ void m20720_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -176,7 +176,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -184,10 +184,10 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -208,13 +208,13 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -223,7 +223,7 @@ KERNEL_FQ void m20720_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m20800_a0-optimized.cl b/OpenCL/m20800_a0-optimized.cl index fd07fac9b..f3ced6638 100644 --- a/OpenCL/m20800_a0-optimized.cl +++ b/OpenCL/m20800_a0-optimized.cl @@ -70,7 +70,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -94,7 +94,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -341,7 +341,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -367,24 +367,24 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -395,7 +395,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m20800_a0-pure.cl b/OpenCL/m20800_a0-pure.cl index 3e4d11dbf..c0cf773fb 100644 --- a/OpenCL/m20800_a0-pure.cl +++ b/OpenCL/m20800_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,7 +68,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -157,7 +157,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -165,10 +165,10 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -181,7 +181,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m20800_a1-optimized.cl b/OpenCL/m20800_a1-optimized.cl index c65163d38..65cb2a043 100644 --- a/OpenCL/m20800_a1-optimized.cl +++ b/OpenCL/m20800_a1-optimized.cl @@ -68,7 +68,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -92,7 +92,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -130,7 +130,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -394,7 +394,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -420,24 +420,24 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -448,7 +448,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -486,7 +486,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m20800_a1-pure.cl b/OpenCL/m20800_a1-pure.cl index 239bb142c..022e41013 100644 --- a/OpenCL/m20800_a1-pure.cl +++ b/OpenCL/m20800_a1-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -70,7 +70,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -153,7 +153,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -161,10 +161,10 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -181,7 +181,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m20800_a3-optimized.cl b/OpenCL/m20800_a3-optimized.cl index a879c64c8..63e2d3bbb 100644 --- a/OpenCL/m20800_a3-optimized.cl +++ b/OpenCL/m20800_a3-optimized.cl @@ -56,7 +56,7 @@ DECLSPEC void m20800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -292,24 +292,24 @@ DECLSPEC void m20800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -322,7 +322,7 @@ DECLSPEC void m20800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -573,7 +573,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -613,7 +613,7 @@ KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) * main */ - m20800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20800_m08 (KERN_ATTR_BASIC ()) @@ -643,7 +643,7 @@ KERNEL_FQ void m20800_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -683,7 +683,7 @@ KERNEL_FQ void m20800_m08 (KERN_ATTR_BASIC ()) * main */ - m20800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20800_m16 (KERN_ATTR_BASIC ()) @@ -713,7 +713,7 @@ KERNEL_FQ void m20800_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -753,7 +753,7 @@ KERNEL_FQ void m20800_m16 (KERN_ATTR_BASIC ()) * main */ - m20800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) @@ -783,7 +783,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -823,7 +823,7 @@ KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) * main */ - m20800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20800_s08 (KERN_ATTR_BASIC ()) @@ -853,7 +853,7 @@ KERNEL_FQ void m20800_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -893,7 +893,7 @@ KERNEL_FQ void m20800_s08 (KERN_ATTR_BASIC ()) * main */ - m20800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20800_s16 (KERN_ATTR_BASIC ()) @@ -923,7 +923,7 @@ KERNEL_FQ void m20800_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -963,5 +963,5 @@ KERNEL_FQ void m20800_s16 (KERN_ATTR_BASIC ()) * main */ - m20800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m20800_a3-pure.cl b/OpenCL/m20800_a3-pure.cl index 12bb433d5..ee654c557 100644 --- a/OpenCL/m20800_a3-pure.cl +++ b/OpenCL/m20800_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -75,7 +75,7 @@ KERNEL_FQ void m20800_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -166,7 +166,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -174,10 +174,10 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -199,7 +199,7 @@ KERNEL_FQ void m20800_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m20900_a0-optimized.cl b/OpenCL/m20900_a0-optimized.cl index a12d8693b..af7824916 100644 --- a/OpenCL/m20900_a0-optimized.cl +++ b/OpenCL/m20900_a0-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,7 +80,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -766,7 +766,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -792,17 +792,17 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m20900_a0-pure.cl b/OpenCL/m20900_a0-pure.cl index 903d11119..9c3410793 100644 --- a/OpenCL/m20900_a0-pure.cl +++ b/OpenCL/m20900_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,7 +73,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -236,7 +236,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -244,10 +244,10 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -265,7 +265,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m20900_a1-optimized.cl b/OpenCL/m20900_a1-optimized.cl index 9e06d620f..099f287b0 100644 --- a/OpenCL/m20900_a1-optimized.cl +++ b/OpenCL/m20900_a1-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -78,7 +78,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -116,7 +116,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -822,7 +822,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -848,17 +848,17 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -896,7 +896,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m20900_a1-pure.cl b/OpenCL/m20900_a1-pure.cl index 3f7956aba..fd053f8e0 100644 --- a/OpenCL/m20900_a1-pure.cl +++ b/OpenCL/m20900_a1-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -81,7 +81,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx0 = ctx00; @@ -236,7 +236,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -244,10 +244,10 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -275,7 +275,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx0 = ctx00; diff --git a/OpenCL/m20900_a3-optimized.cl b/OpenCL/m20900_a3-optimized.cl index 28b6206ba..32f38a275 100644 --- a/OpenCL/m20900_a3-optimized.cl +++ b/OpenCL/m20900_a3-optimized.cl @@ -42,7 +42,7 @@ DECLSPEC void m20900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -703,10 +703,10 @@ DECLSPEC void m20900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -715,7 +715,7 @@ DECLSPEC void m20900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -1391,7 +1391,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1431,7 +1431,7 @@ KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ()) * main */ - m20900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20900_m08 (KERN_ATTR_BASIC ()) @@ -1461,7 +1461,7 @@ KERNEL_FQ void m20900_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1501,7 +1501,7 @@ KERNEL_FQ void m20900_m08 (KERN_ATTR_BASIC ()) * main */ - m20900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20900_m16 (KERN_ATTR_BASIC ()) @@ -1531,7 +1531,7 @@ KERNEL_FQ void m20900_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1571,7 +1571,7 @@ KERNEL_FQ void m20900_m16 (KERN_ATTR_BASIC ()) * main */ - m20900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ()) @@ -1601,7 +1601,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1641,7 +1641,7 @@ KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ()) * main */ - m20900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20900_s08 (KERN_ATTR_BASIC ()) @@ -1671,7 +1671,7 @@ KERNEL_FQ void m20900_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1711,7 +1711,7 @@ KERNEL_FQ void m20900_s08 (KERN_ATTR_BASIC ()) * main */ - m20900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m20900_s16 (KERN_ATTR_BASIC ()) @@ -1741,7 +1741,7 @@ KERNEL_FQ void m20900_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1781,5 +1781,5 @@ KERNEL_FQ void m20900_s16 (KERN_ATTR_BASIC ()) * main */ - m20900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m20900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m20900_a3-pure.cl b/OpenCL/m20900_a3-pure.cl index 1ffbb1b96..dc1ed44bd 100644 --- a/OpenCL/m20900_a3-pure.cl +++ b/OpenCL/m20900_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,7 +80,7 @@ KERNEL_FQ void m20900_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -245,7 +245,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -253,10 +253,10 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -283,7 +283,7 @@ KERNEL_FQ void m20900_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21000_a0-optimized.cl b/OpenCL/m21000_a0-optimized.cl index d0f88c06a..8af216879 100644 --- a/OpenCL/m21000_a0-optimized.cl +++ b/OpenCL/m21000_a0-optimized.cl @@ -139,7 +139,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -159,7 +159,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -288,7 +288,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -310,17 +310,17 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m21000_a0-pure.cl b/OpenCL/m21000_a0-pure.cl index 33fde2983..448b003f1 100644 --- a/OpenCL/m21000_a0-pure.cl +++ b/OpenCL/m21000_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -96,7 +96,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -104,10 +104,10 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -120,7 +120,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m21000_a1-optimized.cl b/OpenCL/m21000_a1-optimized.cl index f9110176d..69b164fa4 100644 --- a/OpenCL/m21000_a1-optimized.cl +++ b/OpenCL/m21000_a1-optimized.cl @@ -232,7 +232,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -252,7 +252,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -290,7 +290,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -419,7 +419,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -441,17 +441,17 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -489,7 +489,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m21000_a1-pure.cl b/OpenCL/m21000_a1-pure.cl index c83514fdd..5de4b1fed 100644 --- a/OpenCL/m21000_a1-pure.cl +++ b/OpenCL/m21000_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,7 +39,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx0 = ctx00; @@ -92,7 +92,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -100,10 +100,10 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -120,7 +120,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx0 = ctx00; diff --git a/OpenCL/m21000_a3-optimized.cl b/OpenCL/m21000_a3-optimized.cl index cdb3f0038..352a46e2f 100644 --- a/OpenCL/m21000_a3-optimized.cl +++ b/OpenCL/m21000_a3-optimized.cl @@ -233,7 +233,7 @@ DECLSPEC void m21000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -326,10 +326,10 @@ DECLSPEC void m21000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -338,7 +338,7 @@ DECLSPEC void m21000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -424,7 +424,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -451,7 +451,7 @@ KERNEL_FQ void m21000_m04 (KERN_ATTR_VECTOR ()) * main */ - m21000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21000_m08 (KERN_ATTR_VECTOR ()) @@ -462,7 +462,7 @@ KERNEL_FQ void m21000_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -489,7 +489,7 @@ KERNEL_FQ void m21000_m08 (KERN_ATTR_VECTOR ()) * main */ - m21000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21000_m16 (KERN_ATTR_VECTOR ()) @@ -500,7 +500,7 @@ KERNEL_FQ void m21000_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -527,7 +527,7 @@ KERNEL_FQ void m21000_m16 (KERN_ATTR_VECTOR ()) * main */ - m21000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21000_s04 (KERN_ATTR_VECTOR ()) @@ -538,7 +538,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -565,7 +565,7 @@ KERNEL_FQ void m21000_s04 (KERN_ATTR_VECTOR ()) * main */ - m21000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21000_s08 (KERN_ATTR_VECTOR ()) @@ -576,7 +576,7 @@ KERNEL_FQ void m21000_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -603,7 +603,7 @@ KERNEL_FQ void m21000_s08 (KERN_ATTR_VECTOR ()) * main */ - m21000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21000_s16 (KERN_ATTR_VECTOR ()) @@ -614,7 +614,7 @@ KERNEL_FQ void m21000_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -641,5 +641,5 @@ KERNEL_FQ void m21000_s16 (KERN_ATTR_VECTOR ()) * main */ - m21000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m21000_a3-pure.cl b/OpenCL/m21000_a3-pure.cl index e12d498bf..307e26fd9 100644 --- a/OpenCL/m21000_a3-pure.cl +++ b/OpenCL/m21000_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m21000_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -105,7 +105,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -113,10 +113,10 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -138,7 +138,7 @@ KERNEL_FQ void m21000_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21100_a0-optimized.cl b/OpenCL/m21100_a0-optimized.cl index e7bed2442..1a79c4ab1 100644 --- a/OpenCL/m21100_a0-optimized.cl +++ b/OpenCL/m21100_a0-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -85,24 +85,24 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; append_0x80_4x4_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, salt_len); @@ -110,7 +110,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -421,7 +421,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -450,24 +450,24 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; append_0x80_4x4_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, salt_len); @@ -477,10 +477,10 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -493,7 +493,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m21100_a0-pure.cl b/OpenCL/m21100_a0-pure.cl index d9921cd95..5f1d71609 100644 --- a/OpenCL/m21100_a0-pure.cl +++ b/OpenCL/m21100_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -64,13 +64,13 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -82,7 +82,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -173,7 +173,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -181,10 +181,10 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -193,13 +193,13 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -211,7 +211,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m21100_a1-optimized.cl b/OpenCL/m21100_a1-optimized.cl index 256b44509..896a6bd55 100644 --- a/OpenCL/m21100_a1-optimized.cl +++ b/OpenCL/m21100_a1-optimized.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -83,30 +83,30 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -144,7 +144,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -477,7 +477,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -503,10 +503,10 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -524,30 +524,30 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -585,7 +585,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m21100_a1-pure.cl b/OpenCL/m21100_a1-pure.cl index 4d3e348ef..a77d760b3 100644 --- a/OpenCL/m21100_a1-pure.cl +++ b/OpenCL/m21100_a1-pure.cl @@ -54,19 +54,19 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -84,7 +84,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -169,7 +169,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -177,23 +177,23 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } md5_ctx_t ctx0; @@ -211,7 +211,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m21100_a3-optimized.cl b/OpenCL/m21100_a3-optimized.cl index 4dacc7376..f67d78e33 100644 --- a/OpenCL/m21100_a3-optimized.cl +++ b/OpenCL/m21100_a3-optimized.cl @@ -45,24 +45,24 @@ DECLSPEC void m21100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; /** @@ -118,7 +118,7 @@ DECLSPEC void m21100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -376,10 +376,10 @@ DECLSPEC void m21100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -394,7 +394,7 @@ DECLSPEC void m21100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -667,7 +667,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -707,7 +707,7 @@ KERNEL_FQ void m21100_m04 (KERN_ATTR_BASIC ()) * main */ - m21100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21100_m08 (KERN_ATTR_BASIC ()) @@ -737,7 +737,7 @@ KERNEL_FQ void m21100_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -777,7 +777,7 @@ KERNEL_FQ void m21100_m08 (KERN_ATTR_BASIC ()) * main */ - m21100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21100_m16 (KERN_ATTR_BASIC ()) @@ -807,7 +807,7 @@ KERNEL_FQ void m21100_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -847,7 +847,7 @@ KERNEL_FQ void m21100_m16 (KERN_ATTR_BASIC ()) * main */ - m21100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) @@ -877,7 +877,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -917,7 +917,7 @@ KERNEL_FQ void m21100_s04 (KERN_ATTR_BASIC ()) * main */ - m21100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21100_s08 (KERN_ATTR_BASIC ()) @@ -947,7 +947,7 @@ KERNEL_FQ void m21100_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -987,7 +987,7 @@ KERNEL_FQ void m21100_s08 (KERN_ATTR_BASIC ()) * main */ - m21100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21100_s16 (KERN_ATTR_BASIC ()) @@ -1017,7 +1017,7 @@ KERNEL_FQ void m21100_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1057,5 +1057,5 @@ KERNEL_FQ void m21100_s16 (KERN_ATTR_BASIC ()) * main */ - m21100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m21100_a3-pure.cl b/OpenCL/m21100_a3-pure.cl index 480d7eb4e..772248965 100644 --- a/OpenCL/m21100_a3-pure.cl +++ b/OpenCL/m21100_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -69,13 +69,13 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -89,7 +89,7 @@ KERNEL_FQ void m21100_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -182,7 +182,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -190,10 +190,10 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -209,13 +209,13 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -229,7 +229,7 @@ KERNEL_FQ void m21100_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21200_a0-optimized.cl b/OpenCL/m21200_a0-optimized.cl index 57901acfd..cfdf5ec58 100644 --- a/OpenCL/m21200_a0-optimized.cl +++ b/OpenCL/m21200_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,16 +84,16 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -105,7 +105,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -477,7 +477,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -506,16 +506,16 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -529,17 +529,17 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m21200_a0-pure.cl b/OpenCL/m21200_a0-pure.cl index aa3dfb225..8749ff55c 100644 --- a/OpenCL/m21200_a0-pure.cl +++ b/OpenCL/m21200_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -72,16 +72,16 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -99,7 +99,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -193,7 +193,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -201,10 +201,10 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -222,16 +222,16 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -249,7 +249,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m21200_a1-optimized.cl b/OpenCL/m21200_a1-optimized.cl index aa730dba5..90c93cefd 100644 --- a/OpenCL/m21200_a1-optimized.cl +++ b/OpenCL/m21200_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,16 +82,16 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -103,7 +103,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -141,7 +141,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -533,7 +533,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -562,16 +562,16 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -585,17 +585,17 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -633,7 +633,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m21200_a1-pure.cl b/OpenCL/m21200_a1-pure.cl index bcd2056e9..89c2961c0 100644 --- a/OpenCL/m21200_a1-pure.cl +++ b/OpenCL/m21200_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -74,16 +74,16 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -101,7 +101,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx11; @@ -189,7 +189,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -197,10 +197,10 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -222,16 +222,16 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -249,7 +249,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx11; diff --git a/OpenCL/m21200_a3-optimized.cl b/OpenCL/m21200_a3-optimized.cl index 06490371d..ea931464e 100644 --- a/OpenCL/m21200_a3-optimized.cl +++ b/OpenCL/m21200_a3-optimized.cl @@ -44,16 +44,16 @@ DECLSPEC void m21200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -67,7 +67,7 @@ DECLSPEC void m21200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -417,16 +417,16 @@ DECLSPEC void m21200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -440,10 +440,10 @@ DECLSPEC void m21200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -452,7 +452,7 @@ DECLSPEC void m21200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -814,7 +814,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -854,7 +854,7 @@ KERNEL_FQ void m21200_m04 (KERN_ATTR_BASIC ()) * main */ - m21200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21200_m08 (KERN_ATTR_BASIC ()) @@ -884,7 +884,7 @@ KERNEL_FQ void m21200_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -924,7 +924,7 @@ KERNEL_FQ void m21200_m08 (KERN_ATTR_BASIC ()) * main */ - m21200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21200_m16 (KERN_ATTR_BASIC ()) @@ -954,7 +954,7 @@ KERNEL_FQ void m21200_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -994,7 +994,7 @@ KERNEL_FQ void m21200_m16 (KERN_ATTR_BASIC ()) * main */ - m21200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) @@ -1024,7 +1024,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1064,7 +1064,7 @@ KERNEL_FQ void m21200_s04 (KERN_ATTR_BASIC ()) * main */ - m21200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21200_s08 (KERN_ATTR_BASIC ()) @@ -1094,7 +1094,7 @@ KERNEL_FQ void m21200_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1134,7 +1134,7 @@ KERNEL_FQ void m21200_s08 (KERN_ATTR_BASIC ()) * main */ - m21200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m21200_s16 (KERN_ATTR_BASIC ()) @@ -1164,7 +1164,7 @@ KERNEL_FQ void m21200_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1204,5 +1204,5 @@ KERNEL_FQ void m21200_s16 (KERN_ATTR_BASIC ()) * main */ - m21200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m21200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m21200_a3-pure.cl b/OpenCL/m21200_a3-pure.cl index daa2e9789..d9725b340 100644 --- a/OpenCL/m21200_a3-pure.cl +++ b/OpenCL/m21200_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -77,16 +77,16 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ()) u32x salt_buf2[4]; u32x salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -106,7 +106,7 @@ KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -200,7 +200,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -208,10 +208,10 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -236,16 +236,16 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ()) u32x salt_buf2[4]; u32x salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf_pc[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf_pc[1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf_pc[2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf_pc[3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf_pc[4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf_pc[5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf_pc[6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf_pc[7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf_pc[8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf_pc[9]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf_pc[6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf_pc[7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf_pc[8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf_pc[9]; salt_buf2[2] = 0; salt_buf2[3] = 0; salt_buf3[0] = 0; @@ -265,7 +265,7 @@ KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21300_a0-pure.cl b/OpenCL/m21300_a0-pure.cl index 4110c685e..c3da03402 100644 --- a/OpenCL/m21300_a0-pure.cl +++ b/OpenCL/m21300_a0-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,13 +68,13 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_RULES ()) sha1_init(&ctx00); - sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_ctx_t ctx11; md5_init (&ctx11); - md5_update_global (&ctx11, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx11, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -85,7 +85,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -173,7 +173,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -181,10 +181,10 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -197,13 +197,13 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_RULES ()) sha1_init(&ctx00); - sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_ctx_t ctx11; md5_init (&ctx11); - md5_update_global (&ctx11, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx11, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -214,7 +214,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m21300_a1-pure.cl b/OpenCL/m21300_a1-pure.cl index 54d83512c..c1c9350cb 100644 --- a/OpenCL/m21300_a1-pure.cl +++ b/OpenCL/m21300_a1-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -64,7 +64,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx00); - sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx00, pws[gid].i, pws[gid].pw_len); @@ -72,7 +72,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_BASIC ()) md5_init (&ctx11); - md5_update_global (&ctx11, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx11, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -83,7 +83,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx0 = ctx00; @@ -167,7 +167,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -175,10 +175,10 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -189,7 +189,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx00); - sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update_global_swap (&ctx00, pws[gid].i, pws[gid].pw_len); @@ -197,7 +197,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ()) md5_init (&ctx11); - md5_update_global (&ctx11, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx11, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -208,7 +208,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx0 = ctx00; diff --git a/OpenCL/m21300_a3-pure.cl b/OpenCL/m21300_a3-pure.cl index 456c04561..7ba6cc6fd 100644 --- a/OpenCL/m21300_a3-pure.cl +++ b/OpenCL/m21300_a3-pure.cl @@ -54,7 +54,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -73,13 +73,13 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx00); - sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_ctx_t ctx11; md5_init (&ctx11); - md5_update_global (&ctx11, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx11, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -92,7 +92,7 @@ KERNEL_FQ void m21300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -186,7 +186,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -194,10 +194,10 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -217,13 +217,13 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_VECTOR ()) sha1_init (&ctx00); - sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx00, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); md5_ctx_t ctx11; md5_init (&ctx11); - md5_update_global (&ctx11, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + md5_update_global (&ctx11, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -236,7 +236,7 @@ KERNEL_FQ void m21300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21400_a0-optimized.cl b/OpenCL/m21400_a0-optimized.cl index 042bc8d53..6d7c27a45 100644 --- a/OpenCL/m21400_a0-optimized.cl +++ b/OpenCL/m21400_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -64,7 +64,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -299,7 +299,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -321,24 +321,24 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -349,7 +349,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m21400_a0-pure.cl b/OpenCL/m21400_a0-pure.cl index befa428d0..480827a1f 100644 --- a/OpenCL/m21400_a0-pure.cl +++ b/OpenCL/m21400_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -100,7 +100,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -108,10 +108,10 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -129,7 +129,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_RULES ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m21400_a1-optimized.cl b/OpenCL/m21400_a1-optimized.cl index f601fa0fa..d9db39016 100644 --- a/OpenCL/m21400_a1-optimized.cl +++ b/OpenCL/m21400_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -62,7 +62,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -100,7 +100,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -355,7 +355,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -377,24 +377,24 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -405,7 +405,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -443,7 +443,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m21400_a1-pure.cl b/OpenCL/m21400_a1-pure.cl index 35eb73dbe..bae678430 100644 --- a/OpenCL/m21400_a1-pure.cl +++ b/OpenCL/m21400_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; @@ -96,7 +96,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -104,10 +104,10 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -129,7 +129,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; diff --git a/OpenCL/m21400_a3-optimized.cl b/OpenCL/m21400_a3-optimized.cl index fe61dac8f..c1c068f2e 100644 --- a/OpenCL/m21400_a3-optimized.cl +++ b/OpenCL/m21400_a3-optimized.cl @@ -43,7 +43,7 @@ DECLSPEC void m21400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -262,24 +262,24 @@ DECLSPEC void m21400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -292,7 +292,7 @@ DECLSPEC void m21400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -507,7 +507,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -534,7 +534,7 @@ KERNEL_FQ void m21400_m04 (KERN_ATTR_VECTOR ()) * main */ - m21400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21400_m08 (KERN_ATTR_VECTOR ()) @@ -545,7 +545,7 @@ KERNEL_FQ void m21400_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -572,7 +572,7 @@ KERNEL_FQ void m21400_m08 (KERN_ATTR_VECTOR ()) * main */ - m21400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21400_m16 (KERN_ATTR_VECTOR ()) @@ -583,7 +583,7 @@ KERNEL_FQ void m21400_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -610,7 +610,7 @@ KERNEL_FQ void m21400_m16 (KERN_ATTR_VECTOR ()) * main */ - m21400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21400_s04 (KERN_ATTR_VECTOR ()) @@ -621,7 +621,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -648,7 +648,7 @@ KERNEL_FQ void m21400_s04 (KERN_ATTR_VECTOR ()) * main */ - m21400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21400_s08 (KERN_ATTR_VECTOR ()) @@ -659,7 +659,7 @@ KERNEL_FQ void m21400_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -686,7 +686,7 @@ KERNEL_FQ void m21400_s08 (KERN_ATTR_VECTOR ()) * main */ - m21400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m21400_s16 (KERN_ATTR_VECTOR ()) @@ -697,7 +697,7 @@ KERNEL_FQ void m21400_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -724,5 +724,5 @@ KERNEL_FQ void m21400_s16 (KERN_ATTR_VECTOR ()) * main */ - m21400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m21400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m21400_a3-pure.cl b/OpenCL/m21400_a3-pure.cl index 4d54c7c55..09fdaca3c 100644 --- a/OpenCL/m21400_a3-pure.cl +++ b/OpenCL/m21400_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -49,7 +49,7 @@ KERNEL_FQ void m21400_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -109,7 +109,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -117,10 +117,10 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -147,7 +147,7 @@ KERNEL_FQ void m21400_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21420_a0-pure.cl b/OpenCL/m21420_a0-pure.cl index 4da324233..762e1006d 100644 --- a/OpenCL/m21420_a0-pure.cl +++ b/OpenCL/m21420_a0-pure.cl @@ -26,7 +26,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,20 +39,20 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -121,7 +121,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -129,10 +129,10 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -146,20 +146,20 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m21420_a1-pure.cl b/OpenCL/m21420_a1-pure.cl index 654a2afc1..27ba02168 100644 --- a/OpenCL/m21420_a1-pure.cl +++ b/OpenCL/m21420_a1-pure.cl @@ -24,7 +24,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,11 +37,11 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_BASIC ()) u32 s[64] = { 0 }; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx1; @@ -54,7 +54,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; @@ -117,7 +117,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -125,10 +125,10 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -140,13 +140,13 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_BASIC ()) u32 w2[4]; u32 w3[4]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx1; @@ -159,7 +159,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx0 = ctx1; diff --git a/OpenCL/m21420_a3-pure.cl b/OpenCL/m21420_a3-pure.cl index fa8d86f4a..3295982bd 100644 --- a/OpenCL/m21420_a3-pure.cl +++ b/OpenCL/m21420_a3-pure.cl @@ -24,7 +24,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,13 +44,13 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -59,7 +59,7 @@ KERNEL_FQ void m21420_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -130,7 +130,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -138,10 +138,10 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -162,13 +162,13 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } /** @@ -177,7 +177,7 @@ KERNEL_FQ void m21420_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m21500-pure.cl b/OpenCL/m21500-pure.cl index 241b0beb4..a270c241d 100644 --- a/OpenCL/m21500-pure.cl +++ b/OpenCL/m21500-pure.cl @@ -78,7 +78,7 @@ KERNEL_FQ void m21500_init (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -96,7 +96,7 @@ KERNEL_FQ void m21500_init (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 256; i += 5, j += 1) { @@ -146,7 +146,7 @@ KERNEL_FQ void m21500_loop (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -180,7 +180,7 @@ KERNEL_FQ void m21500_loop (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -235,7 +235,7 @@ KERNEL_FQ void m21500_comp (KERN_ATTR_TMPS_ESALT (solarwinds_tmp_t, solarwinds_t const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m21600-pure.cl b/OpenCL/m21600-pure.cl index 71add4921..3125fc4b3 100644 --- a/OpenCL/m21600-pure.cl +++ b/OpenCL/m21600-pure.cl @@ -93,7 +93,7 @@ KERNEL_FQ void m21600_init (KERN_ATTR_TMPS (web2py_sha512_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -117,7 +117,7 @@ KERNEL_FQ void m21600_init (KERN_ATTR_TMPS (web2py_sha512_tmp_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -193,7 +193,7 @@ KERNEL_FQ void m21600_loop (KERN_ATTR_TMPS (web2py_sha512_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -239,7 +239,7 @@ KERNEL_FQ void m21600_loop (KERN_ATTR_TMPS (web2py_sha512_tmp_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -323,7 +323,7 @@ KERNEL_FQ void m21600_comp (KERN_ATTR_TMPS (web2py_sha512_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m21700-pure.cl b/OpenCL/m21700-pure.cl index 9da4fb91a..bdfd294c4 100644 --- a/OpenCL/m21700-pure.cl +++ b/OpenCL/m21700-pure.cl @@ -103,7 +103,7 @@ KERNEL_FQ void m21700_init (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -196,7 +196,7 @@ KERNEL_FQ void m21700_loop (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -240,7 +240,7 @@ KERNEL_FQ void m21700_loop (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) out[6] = pack64v (tmps, out, gid, 6); out[7] = pack64v (tmps, out, gid, 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -323,7 +323,7 @@ KERNEL_FQ void m21700_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u64 out[8]; @@ -379,7 +379,7 @@ KERNEL_FQ void m21700_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) * the main secp256k1 point multiplication by a scalar/tweak: */ - GLOBAL_AS secp256k1_t *coords = (GLOBAL_AS secp256k1_t *) &esalt_bufs[DIGESTS_OFFSET].coords; + GLOBAL_AS secp256k1_t *coords = (GLOBAL_AS secp256k1_t *) &esalt_bufs[DIGESTS_OFFSET_HOST].coords; u32 pubkey[64] = { 0 }; // for point_mul () we need: 1 + 32 bytes (for sha512 () we need more) @@ -401,9 +401,9 @@ KERNEL_FQ void m21700_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) * sha256-hmac () of the data_buf */ - GLOBAL_AS u32 *data_buf = (GLOBAL_AS u32 *) esalt_bufs[DIGESTS_OFFSET].data_buf; + GLOBAL_AS u32 *data_buf = (GLOBAL_AS u32 *) esalt_bufs[DIGESTS_OFFSET_HOST].data_buf; - u32 data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + u32 data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; u32 key[16] = { 0 }; diff --git a/OpenCL/m21800-pure.cl b/OpenCL/m21800-pure.cl index 51af1ee4a..7e2d5dd74 100644 --- a/OpenCL/m21800-pure.cl +++ b/OpenCL/m21800-pure.cl @@ -104,7 +104,7 @@ KERNEL_FQ void m21800_init (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -197,7 +197,7 @@ KERNEL_FQ void m21800_loop (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -241,7 +241,7 @@ KERNEL_FQ void m21800_loop (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) out[6] = pack64v (tmps, out, gid, 6); out[7] = pack64v (tmps, out, gid, 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -373,7 +373,7 @@ KERNEL_FQ void m21800_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* @@ -434,7 +434,7 @@ KERNEL_FQ void m21800_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) * the main secp256k1 point multiplication by a scalar/tweak: */ - GLOBAL_AS secp256k1_t *coords = (GLOBAL_AS secp256k1_t *) &esalt_bufs[DIGESTS_OFFSET].coords; + GLOBAL_AS secp256k1_t *coords = (GLOBAL_AS secp256k1_t *) &esalt_bufs[DIGESTS_OFFSET_HOST].coords; u32 pubkey[64] = { 0 }; // for point_mul () we need: 1 + 32 bytes (for sha512 () we need more) @@ -499,7 +499,7 @@ KERNEL_FQ void m21800_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) // we need to run it at least once: - GLOBAL_AS u32 *data_buf = (GLOBAL_AS u32 *) esalt_bufs[DIGESTS_OFFSET].data_buf; + GLOBAL_AS u32 *data_buf = (GLOBAL_AS u32 *) esalt_bufs[DIGESTS_OFFSET_HOST].data_buf; u32 data[4]; @@ -650,9 +650,9 @@ KERNEL_FQ void m21800_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) if ((entropy >= MIN_ENTROPY) && (entropy <= MAX_ENTROPY)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; @@ -671,9 +671,9 @@ KERNEL_FQ void m21800_comp (KERN_ATTR_TMPS_ESALT (electrum_tmp_t, electrum_t)) ((tmp[0] == 0x7b) && (tmp[1] == 0x0d) && (tmp[2] == 0x0a) && (tmp[3] == 0x20) && (tmp[4] == 0x20) && (tmp[5] == 0x20) && (tmp[6] == 0x20) && (tmp[7] == 0x22))) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m22000-pure.cl b/OpenCL/m22000-pure.cl index 6117d2e31..530ceabd5 100644 --- a/OpenCL/m22000-pure.cl +++ b/OpenCL/m22000-pure.cl @@ -153,7 +153,7 @@ KERNEL_FQ void m22000_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx0; @@ -171,7 +171,7 @@ KERNEL_FQ void m22000_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) tmps[gid].opad[3] = sha1_hmac_ctx0.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx0.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx0, esalt_bufs[DIGESTS_OFFSET].essid_buf, esalt_bufs[DIGESTS_OFFSET].essid_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].essid_buf, esalt_bufs[DIGESTS_OFFSET_HOST].essid_len); u32 w0[4]; u32 w1[4]; @@ -257,7 +257,7 @@ KERNEL_FQ void m22000_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -291,7 +291,7 @@ KERNEL_FQ void m22000_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) out[3] = packv (tmps, out, gid, 3); out[4] = packv (tmps, out, gid, 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -350,7 +350,7 @@ KERNEL_FQ void m22000_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) out[3] = packv (tmps, out, gid, 8); out[4] = packv (tmps, out, gid, 9); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -405,7 +405,7 @@ KERNEL_FQ void m22000_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -419,9 +419,9 @@ KERNEL_FQ void m22000_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -584,7 +584,7 @@ KERNEL_FQ void m22000_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -595,7 +595,7 @@ KERNEL_FQ void m22000_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -609,9 +609,9 @@ KERNEL_FQ void m22000_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -764,7 +764,7 @@ KERNEL_FQ void m22000_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -811,7 +811,7 @@ KERNEL_FQ void m22000_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -825,9 +825,9 @@ KERNEL_FQ void m22000_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -1055,7 +1055,7 @@ KERNEL_FQ void m22000_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -1066,7 +1066,7 @@ KERNEL_FQ void m22000_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1087,9 +1087,9 @@ KERNEL_FQ void m22000_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) w[14] = 0; w[15] = 0; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -1120,7 +1120,7 @@ KERNEL_FQ void m22000_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } diff --git a/OpenCL/m22001-pure.cl b/OpenCL/m22001-pure.cl index 23015b863..9abcdc9c7 100644 --- a/OpenCL/m22001-pure.cl +++ b/OpenCL/m22001-pure.cl @@ -162,7 +162,7 @@ KERNEL_FQ void m22001_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 in[16]; @@ -218,7 +218,7 @@ KERNEL_FQ void m22001_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -232,9 +232,9 @@ KERNEL_FQ void m22001_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -397,7 +397,7 @@ KERNEL_FQ void m22001_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -408,7 +408,7 @@ KERNEL_FQ void m22001_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -422,9 +422,9 @@ KERNEL_FQ void m22001_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -577,7 +577,7 @@ KERNEL_FQ void m22001_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -624,7 +624,7 @@ KERNEL_FQ void m22001_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out0[4]; u32 out1[4]; @@ -638,9 +638,9 @@ KERNEL_FQ void m22001_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) out1[2] = tmps[gid].out[6]; out1[3] = tmps[gid].out[7]; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -868,7 +868,7 @@ KERNEL_FQ void m22001_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } } @@ -879,7 +879,7 @@ KERNEL_FQ void m22001_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -900,9 +900,9 @@ KERNEL_FQ void m22001_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) w[14] = 0; w[15] = 0; - const u32 digest_pos = loop_pos; + const u32 digest_pos = LOOP_POS; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; GLOBAL_AS const wpa_t *wpa = &esalt_bufs[digest_cur]; @@ -933,7 +933,7 @@ KERNEL_FQ void m22001_aux4 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_t)) { if (hc_atomic_inc (&hashes_shown[digest_cur]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, digest_cur, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, digest_cur, gid, 0, 0, 0); } } diff --git a/OpenCL/m22100-pure.cl b/OpenCL/m22100-pure.cl index 26bbd9505..543539716 100644 --- a/OpenCL/m22100-pure.cl +++ b/OpenCL/m22100-pure.cl @@ -141,7 +141,7 @@ KERNEL_FQ void m22100_init (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // sha256 of utf16le converted password: @@ -230,10 +230,10 @@ KERNEL_FQ void m22100_loop (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) u32x t2[4]; u32x t3[4]; - t0[0] = salt_bufs[SALT_POS].salt_buf[0]; - t0[1] = salt_bufs[SALT_POS].salt_buf[1]; - t0[2] = salt_bufs[SALT_POS].salt_buf[2]; - t0[3] = salt_bufs[SALT_POS].salt_buf[3]; + t0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + t0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + t0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + t0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; t1[0] = 0; t1[1] = 0; t1[2] = 0x80000000; @@ -280,7 +280,7 @@ KERNEL_FQ void m22100_loop (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) { for (int j = 0; j < 48; j++) // first 16 set to register { - s_wb_ke_pc[i][j] = esalt_bufs[DIGESTS_OFFSET].wb_ke_pc[loop_pos + t + i][j]; + s_wb_ke_pc[i][j] = esalt_bufs[DIGESTS_OFFSET_HOST].wb_ke_pc[LOOP_POS + t + i][j]; } } @@ -292,7 +292,7 @@ KERNEL_FQ void m22100_loop (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) { for (int j = 0; j < 48; j++) // first 16 set to register { - s_wb_ke_pc[i][j] = esalt_bufs[DIGESTS_OFFSET].wb_ke_pc[loop_pos + t + i][j]; + s_wb_ke_pc[i][j] = esalt_bufs[DIGESTS_OFFSET_HOST].wb_ke_pc[LOOP_POS + t + i][j]; } } } @@ -301,13 +301,13 @@ KERNEL_FQ void m22100_loop (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) #else - s_wb_ke_pc = &esalt_bufs[DIGESTS_OFFSET].wb_ke_pc[loop_pos + t]; + s_wb_ke_pc = &esalt_bufs[DIGESTS_OFFSET_HOST].wb_ke_pc[LOOP_POS + t]; #endif // main loop - for (u32 i = 0, j = loop_pos + t; i < FIXED_ITER_INCR; i++, j++) + for (u32 i = 0, j = LOOP_POS + t; i < FIXED_ITER_INCR; i++, j++) { u32x digest[8]; @@ -404,7 +404,7 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /* * AES decrypt the data_buf @@ -433,10 +433,10 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; // in total we've 60 bytes: we need out0 (16 bytes) to out3 (16 bytes) for MAC verification @@ -448,17 +448,17 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) // some early reject: - out1[0] ^= esalt_bufs[DIGESTS_OFFSET].data[4]; // skip MAC for now (first 16 bytes) + out1[0] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[4]; // skip MAC for now (first 16 bytes) if ((out1[0] & 0xffff0000) != 0x2c000000) return; // data_size must be 0x2c00 - out1[1] ^= esalt_bufs[DIGESTS_OFFSET].data[5]; + out1[1] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[5]; if ((out1[1] & 0xffff0000) != 0x01000000) return; // version must be 0x0100 - out1[2] ^= esalt_bufs[DIGESTS_OFFSET].data[6]; + out1[2] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[6]; if ((out1[2] & 0x00ff0000) != 0x00200000) return; // v2 must be 0x20 @@ -466,19 +466,19 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) // if no MAC verification should be performed, we are already done: - u32 type = esalt_bufs[DIGESTS_OFFSET].type; + u32 type = esalt_bufs[DIGESTS_OFFSET_HOST].type; if (type == 0) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; } - out1[3] ^= esalt_bufs[DIGESTS_OFFSET].data[7]; + out1[3] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[7]; /* * Decrypt the whole data buffer for MAC verification (type == 1): @@ -492,10 +492,10 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) AES256_encrypt (ks, iv, out0, s_te0, s_te1, s_te2, s_te3, s_te4); - out0[0] ^= esalt_bufs[DIGESTS_OFFSET].data[0]; - out0[1] ^= esalt_bufs[DIGESTS_OFFSET].data[1]; - out0[2] ^= esalt_bufs[DIGESTS_OFFSET].data[2]; - out0[3] ^= esalt_bufs[DIGESTS_OFFSET].data[3]; + out0[0] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[0]; + out0[1] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[1]; + out0[2] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[2]; + out0[3] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[3]; // 2 @@ -507,10 +507,10 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) AES256_encrypt (ks, iv, out2, s_te0, s_te1, s_te2, s_te3, s_te4); - out2[0] ^= esalt_bufs[DIGESTS_OFFSET].data[ 8]; - out2[1] ^= esalt_bufs[DIGESTS_OFFSET].data[ 9]; - out2[2] ^= esalt_bufs[DIGESTS_OFFSET].data[10]; - out2[3] ^= esalt_bufs[DIGESTS_OFFSET].data[11]; + out2[0] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[ 8]; + out2[1] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[ 9]; + out2[2] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[10]; + out2[3] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[11]; // 3 @@ -520,9 +520,9 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) AES256_encrypt (ks, iv, out3, s_te0, s_te1, s_te2, s_te3, s_te4); - out3[0] ^= esalt_bufs[DIGESTS_OFFSET].data[12]; - out3[1] ^= esalt_bufs[DIGESTS_OFFSET].data[13]; - out3[2] ^= esalt_bufs[DIGESTS_OFFSET].data[14]; + out3[0] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[12]; + out3[1] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[13]; + out3[2] ^= esalt_bufs[DIGESTS_OFFSET_HOST].data[14]; // compute MAC: @@ -569,8 +569,8 @@ KERNEL_FQ void m22100_comp (KERN_ATTR_TMPS_ESALT (bitlocker_tmp_t, bitlocker_t)) // if we end up here, we are sure to have found the correct password: - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } diff --git a/OpenCL/m22200_a0-optimized.cl b/OpenCL/m22200_a0-optimized.cl index 150380d44..069d612d7 100644 --- a/OpenCL/m22200_a0-optimized.cl +++ b/OpenCL/m22200_a0-optimized.cl @@ -136,7 +136,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -158,16 +158,16 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -259,7 +259,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -281,10 +281,10 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_RULES ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -292,17 +292,17 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m22200_a0-pure.cl b/OpenCL/m22200_a0-pure.cl index 3f0aab63d..7a7a224ec 100644 --- a/OpenCL/m22200_a0-pure.cl +++ b/OpenCL/m22200_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -39,13 +39,13 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_RULES ()) sha512_init (&ctx0); - sha512_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -77,7 +77,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -85,10 +85,10 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -103,13 +103,13 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_RULES ()) sha512_init (&ctx0); - sha512_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22200_a1-optimized.cl b/OpenCL/m22200_a1-optimized.cl index 01d192b99..3bf4460be 100644 --- a/OpenCL/m22200_a1-optimized.cl +++ b/OpenCL/m22200_a1-optimized.cl @@ -134,7 +134,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -156,10 +156,10 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -167,17 +167,17 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -215,7 +215,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -329,7 +329,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -351,10 +351,10 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -362,17 +362,17 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -410,7 +410,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m22200_a1-pure.cl b/OpenCL/m22200_a1-pure.cl index e02d62f87..0cc06a0f4 100644 --- a/OpenCL/m22200_a1-pure.cl +++ b/OpenCL/m22200_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -35,7 +35,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_BASIC ()) sha512_init (&ctx0); - sha512_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -43,7 +43,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; @@ -72,7 +72,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -80,10 +80,10 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -96,7 +96,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_BASIC ()) sha512_init (&ctx0); - sha512_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -104,7 +104,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha512_ctx_t ctx = ctx0; diff --git a/OpenCL/m22200_a3-optimized.cl b/OpenCL/m22200_a3-optimized.cl index 48cf61584..be4da018d 100644 --- a/OpenCL/m22200_a3-optimized.cl +++ b/OpenCL/m22200_a3-optimized.cl @@ -135,10 +135,10 @@ DECLSPEC void m22200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -148,7 +148,7 @@ DECLSPEC void m22200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -213,10 +213,10 @@ DECLSPEC void m22200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf0[2]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -226,10 +226,10 @@ DECLSPEC void m22200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -238,7 +238,7 @@ DECLSPEC void m22200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -296,7 +296,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -349,7 +349,7 @@ KERNEL_FQ void m22200_m04 (KERN_ATTR_BASIC ()) * main */ - m22200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22200_m08 (KERN_ATTR_BASIC ()) @@ -360,7 +360,7 @@ KERNEL_FQ void m22200_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -421,7 +421,7 @@ KERNEL_FQ void m22200_m08 (KERN_ATTR_BASIC ()) * main */ - m22200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22200_m16 (KERN_ATTR_BASIC ()) @@ -432,7 +432,7 @@ KERNEL_FQ void m22200_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -508,7 +508,7 @@ KERNEL_FQ void m22200_m16 (KERN_ATTR_BASIC ()) * main */ - m22200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) @@ -519,7 +519,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -572,7 +572,7 @@ KERNEL_FQ void m22200_s04 (KERN_ATTR_BASIC ()) * main */ - m22200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22200_s08 (KERN_ATTR_BASIC ()) @@ -583,7 +583,7 @@ KERNEL_FQ void m22200_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -644,7 +644,7 @@ KERNEL_FQ void m22200_s08 (KERN_ATTR_BASIC ()) * main */ - m22200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22200_s16 (KERN_ATTR_BASIC ()) @@ -655,7 +655,7 @@ KERNEL_FQ void m22200_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -731,5 +731,5 @@ KERNEL_FQ void m22200_s16 (KERN_ATTR_BASIC ()) * main */ - m22200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m22200_a3-pure.cl b/OpenCL/m22200_a3-pure.cl index 2136db122..ff6dafb0b 100644 --- a/OpenCL/m22200_a3-pure.cl +++ b/OpenCL/m22200_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_VECTOR ()) sha512_init (&ctx0); - sha512_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -52,7 +52,7 @@ KERNEL_FQ void m22200_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -88,7 +88,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -96,10 +96,10 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -121,7 +121,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_VECTOR ()) sha512_init (&ctx0); - sha512_update_global (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -129,7 +129,7 @@ KERNEL_FQ void m22200_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m22300_a0-optimized.cl b/OpenCL/m22300_a0-optimized.cl index 5dc804a2c..763c752ca 100644 --- a/OpenCL/m22300_a0-optimized.cl +++ b/OpenCL/m22300_a0-optimized.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -69,30 +69,30 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -299,7 +299,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -324,24 +324,24 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -349,24 +349,24 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -377,7 +377,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m22300_a0-pure.cl b/OpenCL/m22300_a0-pure.cl index bb37e7f9a..d8e32f240 100644 --- a/OpenCL/m22300_a0-pure.cl +++ b/OpenCL/m22300_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,13 +33,13 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -52,7 +52,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -84,7 +84,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -92,10 +92,10 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -104,13 +104,13 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_RULES ()) COPY_PW (pws[gid]); - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -123,7 +123,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22300_a1-optimized.cl b/OpenCL/m22300_a1-optimized.cl index 3c3f442f2..89c47f313 100644 --- a/OpenCL/m22300_a1-optimized.cl +++ b/OpenCL/m22300_a1-optimized.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -67,30 +67,30 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -128,7 +128,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -357,7 +357,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -382,24 +382,24 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -407,24 +407,24 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -435,7 +435,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -473,7 +473,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m22300_a1-pure.cl b/OpenCL/m22300_a1-pure.cl index 376f2f9af..f20100747 100644 --- a/OpenCL/m22300_a1-pure.cl +++ b/OpenCL/m22300_a1-pure.cl @@ -23,19 +23,19 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -50,7 +50,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -78,7 +78,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -86,23 +86,23 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; @@ -117,7 +117,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m22300_a3-optimized.cl b/OpenCL/m22300_a3-optimized.cl index 04f4d9af5..ff4179f53 100644 --- a/OpenCL/m22300_a3-optimized.cl +++ b/OpenCL/m22300_a3-optimized.cl @@ -46,46 +46,46 @@ DECLSPEC void m22300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -118,7 +118,7 @@ DECLSPEC void m22300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -284,24 +284,24 @@ DECLSPEC void m22300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * reverse */ - u32 a_rev = digests_buf[DIGESTS_OFFSET].digest_buf[0]; - u32 b_rev = digests_buf[DIGESTS_OFFSET].digest_buf[1]; - u32 c_rev = digests_buf[DIGESTS_OFFSET].digest_buf[2]; - u32 d_rev = digests_buf[DIGESTS_OFFSET].digest_buf[3]; - u32 e_rev = digests_buf[DIGESTS_OFFSET].digest_buf[4]; - u32 f_rev = digests_buf[DIGESTS_OFFSET].digest_buf[5]; - u32 g_rev = digests_buf[DIGESTS_OFFSET].digest_buf[6]; - u32 h_rev = digests_buf[DIGESTS_OFFSET].digest_buf[7]; + u32 a_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0]; + u32 b_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1]; + u32 c_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2]; + u32 d_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3]; + u32 e_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[4]; + u32 f_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[5]; + u32 g_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[6]; + u32 h_rev = digests_buf[DIGESTS_OFFSET_HOST].digest_buf[7]; SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); SHA256_STEP_REV (a_rev, b_rev, c_rev, d_rev, e_rev, f_rev, g_rev, h_rev); @@ -317,46 +317,46 @@ DECLSPEC void m22300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; u32 salt_buf0_t[4]; u32 salt_buf1_t[4]; u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0_t[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0_t[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0_t[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0_t[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1_t[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1_t[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1_t[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1_t[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2_t[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2_t[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2_t[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2_t[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3_t[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3_t[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3_t[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3_t[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3_t[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3_t[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3_t[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3_t[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -389,7 +389,7 @@ DECLSPEC void m22300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -551,7 +551,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -587,7 +587,7 @@ KERNEL_FQ void m22300_m04 (KERN_ATTR_BASIC ()) * main */ - m22300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22300_m08 (KERN_ATTR_BASIC ()) @@ -598,7 +598,7 @@ KERNEL_FQ void m22300_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -634,7 +634,7 @@ KERNEL_FQ void m22300_m08 (KERN_ATTR_BASIC ()) * main */ - m22300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22300_m16 (KERN_ATTR_BASIC ()) @@ -645,7 +645,7 @@ KERNEL_FQ void m22300_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -681,7 +681,7 @@ KERNEL_FQ void m22300_m16 (KERN_ATTR_BASIC ()) * main */ - m22300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) @@ -692,7 +692,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -728,7 +728,7 @@ KERNEL_FQ void m22300_s04 (KERN_ATTR_BASIC ()) * main */ - m22300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22300_s08 (KERN_ATTR_BASIC ()) @@ -739,7 +739,7 @@ KERNEL_FQ void m22300_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -775,7 +775,7 @@ KERNEL_FQ void m22300_s08 (KERN_ATTR_BASIC ()) * main */ - m22300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22300_s16 (KERN_ATTR_BASIC ()) @@ -786,7 +786,7 @@ KERNEL_FQ void m22300_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -822,5 +822,5 @@ KERNEL_FQ void m22300_s16 (KERN_ATTR_BASIC ()) * main */ - m22300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m22300_a3-pure.cl b/OpenCL/m22300_a3-pure.cl index 164e32f0a..4f5979fe0 100644 --- a/OpenCL/m22300_a3-pure.cl +++ b/OpenCL/m22300_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,20 +38,20 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -59,7 +59,7 @@ KERNEL_FQ void m22300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -95,7 +95,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -122,20 +122,20 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha256_ctx_t ctx0; sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -143,7 +143,7 @@ KERNEL_FQ void m22300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m22400-pure.cl b/OpenCL/m22400-pure.cl index 1966be697..fe4feb900 100644 --- a/OpenCL/m22400-pure.cl +++ b/OpenCL/m22400-pure.cl @@ -39,16 +39,16 @@ KERNEL_FQ void m22400_init (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // salt: u32 s[16] = { 0 }; // 64-byte aligned - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; const u32 pw_len = pws[gid].pw_len; @@ -112,7 +112,7 @@ KERNEL_FQ void m22400_loop (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // init @@ -130,7 +130,7 @@ KERNEL_FQ void m22400_loop (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t)) // main loop - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { u32 h[8]; @@ -216,7 +216,7 @@ KERNEL_FQ void m22400_comp (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // digest @@ -235,21 +235,21 @@ KERNEL_FQ void m22400_comp (KERN_ATTR_TMPS_ESALT (aescrypt_tmp_t, aescrypt_t)) u32 data[16] = { 0 }; - data[ 0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - data[ 1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - data[ 2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - data[ 3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + data[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + data[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + data[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + data[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; // key - data[ 4] = esalt_bufs[DIGESTS_OFFSET].key[0]; - data[ 5] = esalt_bufs[DIGESTS_OFFSET].key[1]; - data[ 6] = esalt_bufs[DIGESTS_OFFSET].key[2]; - data[ 7] = esalt_bufs[DIGESTS_OFFSET].key[3]; - data[ 8] = esalt_bufs[DIGESTS_OFFSET].key[4]; - data[ 9] = esalt_bufs[DIGESTS_OFFSET].key[5]; - data[10] = esalt_bufs[DIGESTS_OFFSET].key[6]; - data[11] = esalt_bufs[DIGESTS_OFFSET].key[7]; + data[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].key[0]; + data[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].key[1]; + data[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].key[2]; + data[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].key[3]; + data[ 8] = esalt_bufs[DIGESTS_OFFSET_HOST].key[4]; + data[ 9] = esalt_bufs[DIGESTS_OFFSET_HOST].key[5]; + data[10] = esalt_bufs[DIGESTS_OFFSET_HOST].key[6]; + data[11] = esalt_bufs[DIGESTS_OFFSET_HOST].key[7]; /* * HMAC-SHA256: diff --git a/OpenCL/m22500_a0-optimized.cl b/OpenCL/m22500_a0-optimized.cl index 863aca8fd..9c663089e 100644 --- a/OpenCL/m22500_a0-optimized.cl +++ b/OpenCL/m22500_a0-optimized.cl @@ -90,7 +90,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -112,25 +112,25 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_RULES ()) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -609,9 +609,9 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_RULES ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -685,7 +685,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -707,25 +707,25 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_RULES ()) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -1204,9 +1204,9 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_RULES ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m22500_a0-pure.cl b/OpenCL/m22500_a0-pure.cl index 712f7a8e3..1197d87e1 100644 --- a/OpenCL/m22500_a0-pure.cl +++ b/OpenCL/m22500_a0-pure.cl @@ -90,7 +90,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; COPY_PW (pws[gid]); @@ -100,25 +100,25 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_RULES ()) u32 s[64] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -318,9 +318,9 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_RULES ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -386,7 +386,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; COPY_PW (pws[gid]); @@ -396,25 +396,25 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_RULES ()) u32 s[64] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -614,9 +614,9 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_RULES ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m22500_a1-optimized.cl b/OpenCL/m22500_a1-optimized.cl index b4b80502f..0c7d4e12c 100644 --- a/OpenCL/m22500_a1-optimized.cl +++ b/OpenCL/m22500_a1-optimized.cl @@ -89,7 +89,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -111,25 +111,25 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_BASIC ()) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -167,7 +167,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -668,9 +668,9 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_BASIC ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -744,7 +744,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -766,25 +766,25 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_BASIC ()) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -822,7 +822,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -1323,9 +1323,9 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_BASIC ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m22500_a1-pure.cl b/OpenCL/m22500_a1-pure.cl index 1f2257f45..6d44603df 100644 --- a/OpenCL/m22500_a1-pure.cl +++ b/OpenCL/m22500_a1-pure.cl @@ -88,7 +88,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -96,19 +96,19 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_BASIC ()) u32 s[64] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; md5_ctx_t ctx0; @@ -120,7 +120,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { /** * key1 = md5 ($pass . $salt): @@ -322,9 +322,9 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_BASIC ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -390,7 +390,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -398,19 +398,19 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_BASIC ()) u32 s[64] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; md5_ctx_t ctx0; @@ -422,7 +422,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { /** * key1 = md5 ($pass . $salt): @@ -624,9 +624,9 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_BASIC ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m22500_a3-optimized.cl b/OpenCL/m22500_a3-optimized.cl index 0f8372425..0ded3b719 100644 --- a/OpenCL/m22500_a3-optimized.cl +++ b/OpenCL/m22500_a3-optimized.cl @@ -41,8 +41,8 @@ DECLSPEC void m22500 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 salt_buf0[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; salt_buf0[2] = 0x80; salt_buf0[3] = 0; @@ -73,14 +73,14 @@ DECLSPEC void m22500 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * base @@ -160,7 +160,7 @@ DECLSPEC void m22500 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -597,9 +597,9 @@ DECLSPEC void m22500 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -665,7 +665,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -696,7 +696,7 @@ KERNEL_FQ void m22500_m04 (KERN_ATTR_VECTOR ()) * main */ - m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22500_m08 (KERN_ATTR_VECTOR ()) @@ -760,7 +760,7 @@ KERNEL_FQ void m22500_m08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -791,7 +791,7 @@ KERNEL_FQ void m22500_m08 (KERN_ATTR_VECTOR ()) * main */ - m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22500_m16 (KERN_ATTR_VECTOR ()) @@ -855,7 +855,7 @@ KERNEL_FQ void m22500_m16 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -886,7 +886,7 @@ KERNEL_FQ void m22500_m16 (KERN_ATTR_VECTOR ()) * main */ - m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22500_s04 (KERN_ATTR_VECTOR ()) @@ -950,7 +950,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -981,7 +981,7 @@ KERNEL_FQ void m22500_s04 (KERN_ATTR_VECTOR ()) * main */ - m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22500_s08 (KERN_ATTR_VECTOR ()) @@ -1045,7 +1045,7 @@ KERNEL_FQ void m22500_s08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1076,7 +1076,7 @@ KERNEL_FQ void m22500_s08 (KERN_ATTR_VECTOR ()) * main */ - m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m22500_s16 (KERN_ATTR_VECTOR ()) @@ -1140,7 +1140,7 @@ KERNEL_FQ void m22500_s16 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1171,5 +1171,5 @@ KERNEL_FQ void m22500_s16 (KERN_ATTR_VECTOR ()) * main */ - m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m22500 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m22500_a3-pure.cl b/OpenCL/m22500_a3-pure.cl index bb34fa068..5381c343c 100644 --- a/OpenCL/m22500_a3-pure.cl +++ b/OpenCL/m22500_a3-pure.cl @@ -88,7 +88,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -109,19 +109,19 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_VECTOR ()) u32 s[64] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop @@ -129,7 +129,7 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -331,9 +331,9 @@ KERNEL_FQ void m22500_mxx (KERN_ATTR_VECTOR ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -399,7 +399,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -420,19 +420,19 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_VECTOR ()) u32 s[64] = { 0 }; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 data[8]; - data[0] = salt_bufs[SALT_POS].salt_buf[2]; - data[1] = salt_bufs[SALT_POS].salt_buf[3]; - data[2] = salt_bufs[SALT_POS].salt_buf[4]; - data[3] = salt_bufs[SALT_POS].salt_buf[5]; - data[4] = salt_bufs[SALT_POS].salt_buf[6]; - data[5] = salt_bufs[SALT_POS].salt_buf[7]; - data[6] = salt_bufs[SALT_POS].salt_buf[8]; - data[7] = salt_bufs[SALT_POS].salt_buf[9]; + data[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + data[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + data[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + data[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + data[4] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + data[5] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + data[6] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + data[7] = salt_bufs[SALT_POS_HOST].salt_buf[9]; /** * loop @@ -440,7 +440,7 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -642,9 +642,9 @@ KERNEL_FQ void m22500_sxx (KERN_ATTR_VECTOR ()) if (out[3] != 0x41202145) continue; // "A !E" } - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m22600-pure.cl b/OpenCL/m22600-pure.cl index 8353f52e8..15c8b6458 100644 --- a/OpenCL/m22600-pure.cl +++ b/OpenCL/m22600-pure.cl @@ -116,7 +116,7 @@ KERNEL_FQ void m22600_init (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -136,7 +136,7 @@ KERNEL_FQ void m22600_init (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) // salt length is always 32 bytes: - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 34; i += 5, j += 1) { @@ -186,7 +186,7 @@ KERNEL_FQ void m22600_loop (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -220,7 +220,7 @@ KERNEL_FQ void m22600_loop (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -328,14 +328,14 @@ KERNEL_FQ void m22600_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 message_key[4]; - message_key[0] = esalt_bufs[DIGESTS_OFFSET].data[0]; - message_key[1] = esalt_bufs[DIGESTS_OFFSET].data[1]; - message_key[2] = esalt_bufs[DIGESTS_OFFSET].data[2]; - message_key[3] = esalt_bufs[DIGESTS_OFFSET].data[3]; + message_key[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[0]; + message_key[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[1]; + message_key[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[2]; + message_key[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[3]; u32 data_a[12]; u32 data_b[12]; @@ -469,10 +469,10 @@ KERNEL_FQ void m22600_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) { u32 x[4]; - x[0] = esalt_bufs[DIGESTS_OFFSET].data[4 + i]; - x[1] = esalt_bufs[DIGESTS_OFFSET].data[5 + i]; - x[2] = esalt_bufs[DIGESTS_OFFSET].data[6 + i]; - x[3] = esalt_bufs[DIGESTS_OFFSET].data[7 + i]; + x[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[4 + i]; + x[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[5 + i]; + x[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[6 + i]; + x[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[7 + i]; u32 y[4]; @@ -521,9 +521,9 @@ KERNEL_FQ void m22600_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) r2 == message_key[2] && r3 == message_key[3]) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m22700-pure.cl b/OpenCL/m22700-pure.cl index a28b458c2..06336b474 100644 --- a/OpenCL/m22700-pure.cl +++ b/OpenCL/m22700-pure.cl @@ -302,7 +302,7 @@ KERNEL_FQ void m22700_init (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[128] = { 0 }; @@ -430,7 +430,7 @@ KERNEL_FQ void m22700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // SCRYPT part, init V @@ -441,7 +441,7 @@ KERNEL_FQ void m22700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -457,7 +457,7 @@ KERNEL_FQ void m22700_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf; GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf; @@ -466,7 +466,7 @@ KERNEL_FQ void m22700_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -534,7 +534,7 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * 2nd pbkdf2, creates B @@ -654,17 +654,17 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) u32 iv[4]; - iv[0] = salt_bufs[SALT_POS].salt_buf[0]; - iv[1] = salt_bufs[SALT_POS].salt_buf[1]; - iv[2] = salt_bufs[SALT_POS].salt_buf[2]; - iv[3] = salt_bufs[SALT_POS].salt_buf[3]; + iv[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + iv[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + iv[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + iv[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 enc[4]; - enc[0] = salt_bufs[SALT_POS].salt_buf[4]; - enc[1] = salt_bufs[SALT_POS].salt_buf[5]; - enc[2] = salt_bufs[SALT_POS].salt_buf[6]; - enc[3] = salt_bufs[SALT_POS].salt_buf[7]; + enc[0] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + enc[1] = salt_bufs[SALT_POS_HOST].salt_buf[5]; + enc[2] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + enc[3] = salt_bufs[SALT_POS_HOST].salt_buf[7]; u32 dec[4]; @@ -677,9 +677,9 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) if (is_valid_bitcoinj (dec) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; @@ -687,10 +687,10 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) // alternative 2 (second block, fixed IV): - enc[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - enc[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - enc[2] = salt_bufs[SALT_POS].salt_buf[10]; - enc[3] = salt_bufs[SALT_POS].salt_buf[11]; + enc[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + enc[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + enc[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + enc[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; aes256_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -701,9 +701,9 @@ KERNEL_FQ void m22700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) if (is_valid_bitcoinj (dec) == 1) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m22911_a0-pure.cl b/OpenCL/m22911_a0-pure.cl index bf880bece..5ee07c1f0 100644 --- a/OpenCL/m22911_a0-pure.cl +++ b/OpenCL/m22911_a0-pure.cl @@ -67,7 +67,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -89,15 +89,15 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -105,19 +105,19 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -273,7 +273,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -281,10 +281,10 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -295,15 +295,15 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -311,19 +311,19 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22911_a1-pure.cl b/OpenCL/m22911_a1-pure.cl index 313e66589..de4854d54 100644 --- a/OpenCL/m22911_a1-pure.cl +++ b/OpenCL/m22911_a1-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -85,15 +85,15 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -101,19 +101,19 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; @@ -269,7 +269,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -277,10 +277,10 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -289,15 +289,15 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -305,19 +305,19 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; diff --git a/OpenCL/m22911_a3-pure.cl b/OpenCL/m22911_a3-pure.cl index b2294ddb8..7437f07f0 100644 --- a/OpenCL/m22911_a3-pure.cl +++ b/OpenCL/m22911_a3-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -85,15 +85,15 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -101,13 +101,13 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -128,7 +128,7 @@ KERNEL_FQ void m22911_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -286,7 +286,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -294,10 +294,10 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -306,15 +306,15 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -322,13 +322,13 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -349,7 +349,7 @@ KERNEL_FQ void m22911_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m22921_a0-pure.cl b/OpenCL/m22921_a0-pure.cl index 5ef866aba..370a7239b 100644 --- a/OpenCL/m22921_a0-pure.cl +++ b/OpenCL/m22921_a0-pure.cl @@ -67,7 +67,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -75,10 +75,10 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -89,15 +89,15 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -105,19 +105,19 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -240,7 +240,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -248,10 +248,10 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -262,15 +262,15 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -278,19 +278,19 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22921_a1-pure.cl b/OpenCL/m22921_a1-pure.cl index b6b8918f2..b8f0e3b72 100644 --- a/OpenCL/m22921_a1-pure.cl +++ b/OpenCL/m22921_a1-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -85,15 +85,15 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -101,19 +101,19 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; @@ -234,7 +234,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -242,10 +242,10 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -254,15 +254,15 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -270,19 +270,19 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; diff --git a/OpenCL/m22921_a3-pure.cl b/OpenCL/m22921_a3-pure.cl index c3d586802..9b6439b7c 100644 --- a/OpenCL/m22921_a3-pure.cl +++ b/OpenCL/m22921_a3-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -73,10 +73,10 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -85,15 +85,15 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -101,13 +101,13 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -128,7 +128,7 @@ KERNEL_FQ void m22921_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -254,7 +254,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -262,10 +262,10 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -274,15 +274,15 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[2]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; u32 first_data[2]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -290,13 +290,13 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; u32 enc[2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -317,7 +317,7 @@ KERNEL_FQ void m22921_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m22931_a0-pure.cl b/OpenCL/m22931_a0-pure.cl index 6856822df..ba469ee3c 100644 --- a/OpenCL/m22931_a0-pure.cl +++ b/OpenCL/m22931_a0-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -91,10 +91,10 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -105,19 +105,19 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -125,23 +125,23 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -290,7 +290,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -298,10 +298,10 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -312,19 +312,19 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -332,23 +332,23 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22931_a1-pure.cl b/OpenCL/m22931_a1-pure.cl index 983844177..76bb4f297 100644 --- a/OpenCL/m22931_a1-pure.cl +++ b/OpenCL/m22931_a1-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,10 +89,10 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -101,19 +101,19 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -121,23 +121,23 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; @@ -284,7 +284,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -292,10 +292,10 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -304,19 +304,19 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -324,23 +324,23 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; diff --git a/OpenCL/m22931_a3-pure.cl b/OpenCL/m22931_a3-pure.cl index e4ac41d43..ea2032c65 100644 --- a/OpenCL/m22931_a3-pure.cl +++ b/OpenCL/m22931_a3-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,10 +89,10 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -101,19 +101,19 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -121,17 +121,17 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -152,7 +152,7 @@ KERNEL_FQ void m22931_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -303,7 +303,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -311,10 +311,10 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -323,19 +323,19 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -343,17 +343,17 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -374,7 +374,7 @@ KERNEL_FQ void m22931_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m22941_a0-pure.cl b/OpenCL/m22941_a0-pure.cl index 3db9941ac..adf853436 100644 --- a/OpenCL/m22941_a0-pure.cl +++ b/OpenCL/m22941_a0-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -91,10 +91,10 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -105,19 +105,19 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -125,23 +125,23 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -310,7 +310,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -318,10 +318,10 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -332,19 +332,19 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -352,23 +352,23 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22941_a1-pure.cl b/OpenCL/m22941_a1-pure.cl index ede85eef5..e550889a0 100644 --- a/OpenCL/m22941_a1-pure.cl +++ b/OpenCL/m22941_a1-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,10 +89,10 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -101,19 +101,19 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -121,23 +121,23 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; @@ -306,7 +306,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -314,10 +314,10 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -326,19 +326,19 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -346,23 +346,23 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; diff --git a/OpenCL/m22941_a3-pure.cl b/OpenCL/m22941_a3-pure.cl index 291e37da6..80af1bbb8 100644 --- a/OpenCL/m22941_a3-pure.cl +++ b/OpenCL/m22941_a3-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,10 +89,10 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -101,19 +101,19 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -121,17 +121,17 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -152,7 +152,7 @@ KERNEL_FQ void m22941_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -323,7 +323,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -331,10 +331,10 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -343,19 +343,19 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -363,17 +363,17 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -394,7 +394,7 @@ KERNEL_FQ void m22941_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m22951_a0-pure.cl b/OpenCL/m22951_a0-pure.cl index 2e7f655cb..eb4b7e97c 100644 --- a/OpenCL/m22951_a0-pure.cl +++ b/OpenCL/m22951_a0-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -91,10 +91,10 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -105,19 +105,19 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -125,23 +125,23 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -314,7 +314,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_RULES_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -322,10 +322,10 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_RULES_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -336,19 +336,19 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -356,23 +356,23 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_RULES_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m22951_a1-pure.cl b/OpenCL/m22951_a1-pure.cl index 41296ef30..dd57c8863 100644 --- a/OpenCL/m22951_a1-pure.cl +++ b/OpenCL/m22951_a1-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,10 +89,10 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -101,19 +101,19 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -121,23 +121,23 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; @@ -310,7 +310,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -318,10 +318,10 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -330,19 +330,19 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -350,23 +350,23 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx; diff --git a/OpenCL/m22951_a3-pure.cl b/OpenCL/m22951_a3-pure.cl index 8200194e9..c3149e0d0 100644 --- a/OpenCL/m22951_a3-pure.cl +++ b/OpenCL/m22951_a3-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,10 +89,10 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -101,19 +101,19 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -121,17 +121,17 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -152,7 +152,7 @@ KERNEL_FQ void m22951_mxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -327,7 +327,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -335,10 +335,10 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[0], - digests_buf[DIGESTS_OFFSET].digest_buf[1], - digests_buf[DIGESTS_OFFSET].digest_buf[2], - digests_buf[DIGESTS_OFFSET].digest_buf[3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[3] }; /** @@ -347,19 +347,19 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 s[4]; - s[0] = salt_bufs[SALT_POS].salt_buf[0]; - s[1] = salt_bufs[SALT_POS].salt_buf[1]; - s[2] = salt_bufs[SALT_POS].salt_buf[2]; - s[3] = salt_bufs[SALT_POS].salt_buf[3]; + s[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + s[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + s[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 first_data[4]; - first_data[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - first_data[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - first_data[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - first_data[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + first_data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + first_data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + first_data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + first_data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; @@ -367,17 +367,17 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; /** * base @@ -398,7 +398,7 @@ KERNEL_FQ void m22951_sxx (KERN_ATTR_VECTOR_ESALT (pem_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m23001_a0-optimized.cl b/OpenCL/m23001_a0-optimized.cl index aa1f17320..55d28148d 100644 --- a/OpenCL/m23001_a0-optimized.cl +++ b/OpenCL/m23001_a0-optimized.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -103,7 +103,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -312,17 +312,17 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -344,9 +344,9 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -417,7 +417,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -437,7 +437,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -646,17 +646,17 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -678,9 +678,9 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23001_a0-pure.cl b/OpenCL/m23001_a0-pure.cl index 766382acb..097675b0a 100644 --- a/OpenCL/m23001_a0-pure.cl +++ b/OpenCL/m23001_a0-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -95,7 +95,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -178,17 +178,17 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -210,9 +210,9 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -275,7 +275,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -287,7 +287,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -370,17 +370,17 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -402,9 +402,9 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23001_a1-optimized.cl b/OpenCL/m23001_a1-optimized.cl index 4c0a976ad..d1559a683 100644 --- a/OpenCL/m23001_a1-optimized.cl +++ b/OpenCL/m23001_a1-optimized.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -101,7 +101,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_ESALT (securezip_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -139,7 +139,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_ESALT (securezip_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -368,17 +368,17 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -400,9 +400,9 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -473,7 +473,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -493,7 +493,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_ESALT (securezip_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -531,7 +531,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_ESALT (securezip_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -760,17 +760,17 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -792,9 +792,9 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23001_a1-pure.cl b/OpenCL/m23001_a1-pure.cl index 1c1ec65ab..bb097e401 100644 --- a/OpenCL/m23001_a1-pure.cl +++ b/OpenCL/m23001_a1-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -97,7 +97,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -174,17 +174,17 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -206,9 +206,9 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -271,7 +271,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -287,7 +287,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -364,17 +364,17 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -396,9 +396,9 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23001_a3-optimized.cl b/OpenCL/m23001_a3-optimized.cl index bd2ab1861..2e3fa120d 100644 --- a/OpenCL/m23001_a3-optimized.cl +++ b/OpenCL/m23001_a3-optimized.cl @@ -119,7 +119,7 @@ DECLSPEC void m23001m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -338,17 +338,17 @@ DECLSPEC void m23001m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -370,9 +370,9 @@ DECLSPEC void m23001m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -473,7 +473,7 @@ DECLSPEC void m23001s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -692,17 +692,17 @@ DECLSPEC void m23001s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -724,9 +724,9 @@ DECLSPEC void m23001s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -793,7 +793,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -820,7 +820,7 @@ KERNEL_FQ void m23001_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23001m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23001m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23001_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -884,7 +884,7 @@ KERNEL_FQ void m23001_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -911,7 +911,7 @@ KERNEL_FQ void m23001_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23001m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23001m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23001_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -975,7 +975,7 @@ KERNEL_FQ void m23001_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1002,7 +1002,7 @@ KERNEL_FQ void m23001_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23001m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23001m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23001_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1066,7 +1066,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1093,7 +1093,7 @@ KERNEL_FQ void m23001_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23001s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23001s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23001_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1157,7 +1157,7 @@ KERNEL_FQ void m23001_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1184,7 +1184,7 @@ KERNEL_FQ void m23001_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23001s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23001s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23001_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1248,7 +1248,7 @@ KERNEL_FQ void m23001_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1275,5 +1275,5 @@ KERNEL_FQ void m23001_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23001s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23001s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m23001_a3-pure.cl b/OpenCL/m23001_a3-pure.cl index 0f77b0740..c4b94635b 100644 --- a/OpenCL/m23001_a3-pure.cl +++ b/OpenCL/m23001_a3-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -102,7 +102,7 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -187,17 +187,17 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -219,9 +219,9 @@ KERNEL_FQ void m23001_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -284,7 +284,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -305,7 +305,7 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -390,17 +390,17 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 44 @@ -422,9 +422,9 @@ KERNEL_FQ void m23001_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23002_a0-optimized.cl b/OpenCL/m23002_a0-optimized.cl index c37aad9e6..b08d041e5 100644 --- a/OpenCL/m23002_a0-optimized.cl +++ b/OpenCL/m23002_a0-optimized.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -103,7 +103,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -365,17 +365,17 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -397,9 +397,9 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -470,7 +470,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -490,7 +490,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -752,17 +752,17 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -784,9 +784,9 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23002_a0-pure.cl b/OpenCL/m23002_a0-pure.cl index a1e43a58b..6e2afe922 100644 --- a/OpenCL/m23002_a0-pure.cl +++ b/OpenCL/m23002_a0-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -95,7 +95,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -231,17 +231,17 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -263,9 +263,9 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -328,7 +328,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -340,7 +340,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -476,17 +476,17 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -508,9 +508,9 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23002_a1-optimized.cl b/OpenCL/m23002_a1-optimized.cl index d3820d763..d7d33c96b 100644 --- a/OpenCL/m23002_a1-optimized.cl +++ b/OpenCL/m23002_a1-optimized.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -101,7 +101,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_ESALT (securezip_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -139,7 +139,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_ESALT (securezip_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -421,17 +421,17 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -453,9 +453,9 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -526,7 +526,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -546,7 +546,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_ESALT (securezip_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -584,7 +584,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_ESALT (securezip_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -866,17 +866,17 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -898,9 +898,9 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23002_a1-pure.cl b/OpenCL/m23002_a1-pure.cl index cfeb1f8e2..fa53fc9ae 100644 --- a/OpenCL/m23002_a1-pure.cl +++ b/OpenCL/m23002_a1-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -97,7 +97,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -227,17 +227,17 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -259,9 +259,9 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -324,7 +324,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -340,7 +340,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -470,17 +470,17 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -502,9 +502,9 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23002_a3-optimized.cl b/OpenCL/m23002_a3-optimized.cl index 3bc4e1f13..8850bff6f 100644 --- a/OpenCL/m23002_a3-optimized.cl +++ b/OpenCL/m23002_a3-optimized.cl @@ -119,7 +119,7 @@ DECLSPEC void m23002m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -391,17 +391,17 @@ DECLSPEC void m23002m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -423,9 +423,9 @@ DECLSPEC void m23002m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -526,7 +526,7 @@ DECLSPEC void m23002s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -798,17 +798,17 @@ DECLSPEC void m23002s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -830,9 +830,9 @@ DECLSPEC void m23002s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -899,7 +899,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -926,7 +926,7 @@ KERNEL_FQ void m23002_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23002m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23002m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23002_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -990,7 +990,7 @@ KERNEL_FQ void m23002_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1017,7 +1017,7 @@ KERNEL_FQ void m23002_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23002m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23002m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23002_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1081,7 +1081,7 @@ KERNEL_FQ void m23002_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1108,7 +1108,7 @@ KERNEL_FQ void m23002_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23002m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23002m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23002_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1172,7 +1172,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1199,7 +1199,7 @@ KERNEL_FQ void m23002_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23002s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23002s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23002_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1263,7 +1263,7 @@ KERNEL_FQ void m23002_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1290,7 +1290,7 @@ KERNEL_FQ void m23002_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23002s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23002s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23002_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1354,7 +1354,7 @@ KERNEL_FQ void m23002_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1381,5 +1381,5 @@ KERNEL_FQ void m23002_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23002s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23002s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m23002_a3-pure.cl b/OpenCL/m23002_a3-pure.cl index f139efe46..92fb323cd 100644 --- a/OpenCL/m23002_a3-pure.cl +++ b/OpenCL/m23002_a3-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -102,7 +102,7 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -240,17 +240,17 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -272,9 +272,9 @@ KERNEL_FQ void m23002_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -337,7 +337,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -358,7 +358,7 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -496,17 +496,17 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 52 @@ -528,9 +528,9 @@ KERNEL_FQ void m23002_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23003_a0-optimized.cl b/OpenCL/m23003_a0-optimized.cl index ccdcef901..4e8489bf1 100644 --- a/OpenCL/m23003_a0-optimized.cl +++ b/OpenCL/m23003_a0-optimized.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -103,7 +103,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -367,17 +367,17 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -399,9 +399,9 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -472,7 +472,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -492,7 +492,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -756,17 +756,17 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -788,9 +788,9 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23003_a0-pure.cl b/OpenCL/m23003_a0-pure.cl index 22b844159..cfcb50dd3 100644 --- a/OpenCL/m23003_a0-pure.cl +++ b/OpenCL/m23003_a0-pure.cl @@ -83,7 +83,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -95,7 +95,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -233,17 +233,17 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -265,9 +265,9 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -330,7 +330,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -342,7 +342,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -480,17 +480,17 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -512,9 +512,9 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_RULES_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23003_a1-optimized.cl b/OpenCL/m23003_a1-optimized.cl index d972fc711..2a0cb34fe 100644 --- a/OpenCL/m23003_a1-optimized.cl +++ b/OpenCL/m23003_a1-optimized.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -101,7 +101,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_ESALT (securezip_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -139,7 +139,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_ESALT (securezip_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -423,17 +423,17 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -455,9 +455,9 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -528,7 +528,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -548,7 +548,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_ESALT (securezip_t)) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -586,7 +586,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_ESALT (securezip_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -870,17 +870,17 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -902,9 +902,9 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23003_a1-pure.cl b/OpenCL/m23003_a1-pure.cl index ef5680864..56f894fe9 100644 --- a/OpenCL/m23003_a1-pure.cl +++ b/OpenCL/m23003_a1-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -97,7 +97,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -229,17 +229,17 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -261,9 +261,9 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -326,7 +326,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -342,7 +342,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_ESALT (securezip_t)) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -474,17 +474,17 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -506,9 +506,9 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23003_a3-optimized.cl b/OpenCL/m23003_a3-optimized.cl index d94e79c8c..2762ac546 100644 --- a/OpenCL/m23003_a3-optimized.cl +++ b/OpenCL/m23003_a3-optimized.cl @@ -119,7 +119,7 @@ DECLSPEC void m23003m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -393,17 +393,17 @@ DECLSPEC void m23003m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -425,9 +425,9 @@ DECLSPEC void m23003m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -528,7 +528,7 @@ DECLSPEC void m23003s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -802,17 +802,17 @@ DECLSPEC void m23003s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -834,9 +834,9 @@ DECLSPEC void m23003s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -903,7 +903,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -930,7 +930,7 @@ KERNEL_FQ void m23003_m04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23003m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23003m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23003_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -994,7 +994,7 @@ KERNEL_FQ void m23003_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1021,7 +1021,7 @@ KERNEL_FQ void m23003_m08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23003m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23003m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23003_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1085,7 +1085,7 @@ KERNEL_FQ void m23003_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1112,7 +1112,7 @@ KERNEL_FQ void m23003_m16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23003m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23003m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23003_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1176,7 +1176,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1203,7 +1203,7 @@ KERNEL_FQ void m23003_s04 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23003s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23003s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23003_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1267,7 +1267,7 @@ KERNEL_FQ void m23003_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1294,7 +1294,7 @@ KERNEL_FQ void m23003_s08 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23003s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23003s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m23003_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) @@ -1358,7 +1358,7 @@ KERNEL_FQ void m23003_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -1385,5 +1385,5 @@ KERNEL_FQ void m23003_s16 (KERN_ATTR_VECTOR_ESALT (securezip_t)) * main */ - m23003s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m23003s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m23003_a3-pure.cl b/OpenCL/m23003_a3-pure.cl index 530bd5f9e..4f5adca51 100644 --- a/OpenCL/m23003_a3-pure.cl +++ b/OpenCL/m23003_a3-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -102,7 +102,7 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -242,17 +242,17 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -274,9 +274,9 @@ KERNEL_FQ void m23003_mxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } @@ -339,7 +339,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -360,7 +360,7 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -500,17 +500,17 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[28]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[29]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data[30]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data[31]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[28]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[29]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[30]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[31]; u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[32]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[33]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[34]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[35]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[32]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[33]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[34]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[35]; #define KEYLEN 60 @@ -532,9 +532,9 @@ KERNEL_FQ void m23003_sxx (KERN_ATTR_VECTOR_ESALT (securezip_t)) (out[2] == 0x10101010) && (out[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m23100-pure.cl b/OpenCL/m23100-pure.cl index 09918dc77..a3b1e9179 100644 --- a/OpenCL/m23100-pure.cl +++ b/OpenCL/m23100-pure.cl @@ -76,7 +76,7 @@ KERNEL_FQ void m23100_init (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -94,7 +94,7 @@ KERNEL_FQ void m23100_init (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, 20); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, 20); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -144,7 +144,7 @@ KERNEL_FQ void m23100_loop (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -178,7 +178,7 @@ KERNEL_FQ void m23100_loop (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -274,7 +274,7 @@ KERNEL_FQ void m23100_comp (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 key[6]; @@ -294,13 +294,13 @@ KERNEL_FQ void m23100_comp (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) u32 iv[2]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].data[8]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data[9]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[8]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[9]; u32 data[2]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[10]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[11]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[10]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[11]; // 3DES-CBC (decrypt, encrypt, decrypt): @@ -325,9 +325,9 @@ KERNEL_FQ void m23100_comp (KERN_ATTR_TMPS_ESALT (keychain_tmp_t, keychain_t)) if ((out[1] ^ iv[1]) == 0x04040404) // this check uses very low number of bits => collisions { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m23200-pure.cl b/OpenCL/m23200-pure.cl index 8751a8c96..8ebe57a94 100644 --- a/OpenCL/m23200-pure.cl +++ b/OpenCL/m23200-pure.cl @@ -71,7 +71,7 @@ KERNEL_FQ void m23200_init (KERN_ATTR_TMPS (xmpp_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -89,7 +89,7 @@ KERNEL_FQ void m23200_init (KERN_ATTR_TMPS (xmpp_tmp_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -139,7 +139,7 @@ KERNEL_FQ void m23200_loop (KERN_ATTR_TMPS (xmpp_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -173,7 +173,7 @@ KERNEL_FQ void m23200_loop (KERN_ATTR_TMPS (xmpp_tmp_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -228,7 +228,7 @@ KERNEL_FQ void m23200_comp (KERN_ATTR_TMPS (xmpp_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m23300-pure.cl b/OpenCL/m23300-pure.cl index 984c477be..b031e12b9 100644 --- a/OpenCL/m23300-pure.cl +++ b/OpenCL/m23300-pure.cl @@ -77,7 +77,7 @@ KERNEL_FQ void m23300_init (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -100,10 +100,10 @@ KERNEL_FQ void m23300_init (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) u32 w2[4]; u32 w3[4]; - w0[0] = salt_bufs[SALT_POS].salt_buf[0]; - w0[1] = salt_bufs[SALT_POS].salt_buf[1]; - w0[2] = salt_bufs[SALT_POS].salt_buf[2]; - w0[3] = salt_bufs[SALT_POS].salt_buf[3]; + w0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + w0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + w0[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + w0[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; w1[0] = 0; w1[1] = 0; w1[2] = 0; @@ -117,7 +117,7 @@ KERNEL_FQ void m23300_init (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) w3[2] = 0; w3[3] = 0; - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -162,7 +162,7 @@ KERNEL_FQ void m23300_loop (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -196,7 +196,7 @@ KERNEL_FQ void m23300_loop (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -300,7 +300,7 @@ KERNEL_FQ void m23300_comp (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * AES part @@ -321,10 +321,10 @@ KERNEL_FQ void m23300_comp (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[3]; u32 res[12]; // actually res[16], but we don't need the full 64 bytes output @@ -332,10 +332,10 @@ KERNEL_FQ void m23300_comp (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[i + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[i + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[i + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[i + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 3]; u32 out[4]; @@ -400,9 +400,9 @@ KERNEL_FQ void m23300_comp (KERN_ATTR_TMPS_ESALT (iwork_tmp_t, iwork_t)) (res[10] == checksum[2]) && (res[11] == checksum[3])) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m23400-pure.cl b/OpenCL/m23400-pure.cl index 12ac3c473..b3304f508 100644 --- a/OpenCL/m23400-pure.cl +++ b/OpenCL/m23400-pure.cl @@ -77,7 +77,7 @@ KERNEL_FQ void m23400_init (KERN_ATTR_TMPS (bitwarden_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -101,7 +101,7 @@ KERNEL_FQ void m23400_init (KERN_ATTR_TMPS (bitwarden_tmp_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_hmac_ctx_t sha256_hmac_ctx2 = sha256_hmac_ctx; @@ -154,7 +154,7 @@ KERNEL_FQ void m23400_loop (KERN_ATTR_TMPS (bitwarden_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -198,7 +198,7 @@ KERNEL_FQ void m23400_loop (KERN_ATTR_TMPS (bitwarden_tmp_t)) out[6] = packv (tmps, out, gid, 6); out[7] = packv (tmps, out, gid, 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -261,7 +261,7 @@ KERNEL_FQ void m23400_comp (KERN_ATTR_TMPS (bitwarden_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out[16] = { 0 }; diff --git a/OpenCL/m23500-pure.cl b/OpenCL/m23500-pure.cl index e18268d61..d1728f68b 100644 --- a/OpenCL/m23500-pure.cl +++ b/OpenCL/m23500-pure.cl @@ -101,7 +101,7 @@ KERNEL_FQ void m23500_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -125,7 +125,7 @@ KERNEL_FQ void m23500_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -201,7 +201,7 @@ KERNEL_FQ void m23500_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -247,7 +247,7 @@ KERNEL_FQ void m23500_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -331,7 +331,7 @@ KERNEL_FQ void m23500_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out[16]; @@ -361,10 +361,10 @@ KERNEL_FQ void m23500_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) u32 salt[4]; - salt[0] = esalt_bufs[DIGESTS_OFFSET].salt[0]; - salt[1] = esalt_bufs[DIGESTS_OFFSET].salt[1]; - salt[2] = esalt_bufs[DIGESTS_OFFSET].salt[2]; - salt[3] = esalt_bufs[DIGESTS_OFFSET].salt[3]; + salt[0] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[0]; + salt[1] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[1]; + salt[2] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[2]; + salt[3] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[3]; tmps[gid].KEK[0] = KEK[0] ^ salt[0]; tmps[gid].KEK[1] = KEK[1] ^ salt[1]; @@ -373,7 +373,7 @@ KERNEL_FQ void m23500_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) for (int i = 0; i < 10; i++) { - tmps[gid].data[i] = esalt_bufs[DIGESTS_OFFSET].data[i]; + tmps[gid].data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i]; } } @@ -438,7 +438,7 @@ KERNEL_FQ void m23500_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[4]; @@ -468,11 +468,11 @@ KERNEL_FQ void m23500_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) AES128_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - const int wrapping_rounds = (int) salt_bufs[SALT_POS].salt_iter2; + const int wrapping_rounds = (int) salt_bufs[SALT_POS_HOST].salt_iter2; // custom AES un-wrapping loop - for (int i = loop_cnt, j = wrapping_rounds - loop_pos; i > 0; i--, j--) + for (int i = LOOP_CNT, j = wrapping_rounds - LOOP_POS; i > 0; i--, j--) { for (int k = 8, l = 4 * j; k >= 1; k -= 2, l -= 1) { @@ -506,14 +506,14 @@ KERNEL_FQ void m23500_comp (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if ((tmps[gid].data[0] == 0xa6a6a6a6) && (tmps[gid].data[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m23600-pure.cl b/OpenCL/m23600-pure.cl index b14c955d0..3d7bb29a7 100644 --- a/OpenCL/m23600-pure.cl +++ b/OpenCL/m23600-pure.cl @@ -101,7 +101,7 @@ KERNEL_FQ void m23600_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -125,7 +125,7 @@ KERNEL_FQ void m23600_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -201,7 +201,7 @@ KERNEL_FQ void m23600_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -247,7 +247,7 @@ KERNEL_FQ void m23600_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -331,7 +331,7 @@ KERNEL_FQ void m23600_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 out[16]; @@ -365,14 +365,14 @@ KERNEL_FQ void m23600_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) u32 salt[8]; - salt[0] = esalt_bufs[DIGESTS_OFFSET].salt[0]; - salt[1] = esalt_bufs[DIGESTS_OFFSET].salt[1]; - salt[2] = esalt_bufs[DIGESTS_OFFSET].salt[2]; - salt[3] = esalt_bufs[DIGESTS_OFFSET].salt[3]; - salt[4] = esalt_bufs[DIGESTS_OFFSET].salt[4]; - salt[5] = esalt_bufs[DIGESTS_OFFSET].salt[5]; - salt[6] = esalt_bufs[DIGESTS_OFFSET].salt[6]; - salt[7] = esalt_bufs[DIGESTS_OFFSET].salt[7]; + salt[0] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[0]; + salt[1] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[1]; + salt[2] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[2]; + salt[3] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[3]; + salt[4] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[4]; + salt[5] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[5]; + salt[6] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[6]; + salt[7] = esalt_bufs[DIGESTS_OFFSET_HOST].salt[7]; tmps[gid].KEK[0] = KEK[0] ^ salt[0]; tmps[gid].KEK[1] = KEK[1] ^ salt[1]; @@ -385,7 +385,7 @@ KERNEL_FQ void m23600_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) for (int i = 0; i < 14; i++) { - tmps[gid].data[i] = esalt_bufs[DIGESTS_OFFSET].data[i]; + tmps[gid].data[i] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i]; } } @@ -450,7 +450,7 @@ KERNEL_FQ void m23600_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -484,11 +484,11 @@ KERNEL_FQ void m23600_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) AES256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - const int wrapping_rounds = (int) salt_bufs[SALT_POS].salt_iter2; + const int wrapping_rounds = (int) salt_bufs[SALT_POS_HOST].salt_iter2; // custom AES un-wrapping loop - for (int i = loop_cnt, j = wrapping_rounds - loop_pos; i > 0; i--, j--) + for (int i = LOOP_CNT, j = wrapping_rounds - LOOP_POS; i > 0; i--, j--) { for (int k = 12, l = 6 * j; k >= 1; k -= 2, l -= 1) { @@ -522,14 +522,14 @@ KERNEL_FQ void m23600_comp (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; if ((tmps[gid].data[0] == 0xa6a6a6a6) && (tmps[gid].data[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m23700-optimized.cl b/OpenCL/m23700-optimized.cl index f496a32e2..663db8091 100644 --- a/OpenCL/m23700-optimized.cl +++ b/OpenCL/m23700-optimized.cl @@ -145,7 +145,7 @@ KERNEL_FQ void m23700_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].dgst[0][0] = SHA1M_A; tmps[gid].dgst[0][1] = SHA1M_B; @@ -159,7 +159,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf[10]; @@ -178,8 +178,8 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; const u32 salt_len = 8; @@ -202,7 +202,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) const u32 p2 = pw_len + salt_len; const u32 p3 = pw_len + salt_len + 3; - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); u32 dgst[5]; @@ -221,7 +221,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 w6[4] = { 0 }; u32 w7[4] = { 0 }; - u32 iter = loop_pos; + u32 iter = LOOP_POS; for (u32 i = 0; i < 256; i++) { @@ -494,7 +494,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf[10]; @@ -513,8 +513,8 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; const u32 salt_len = 8; @@ -538,7 +538,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) PUTCHAR_BE (largeblock, p, GETCHAR (salt_buf, j)); } - PUTCHAR_BE (largeblock, p + 2, (loop_pos >> 16) & 0xff); + PUTCHAR_BE (largeblock, p + 2, (LOOP_POS >> 16) & 0xff); p += 3; } @@ -547,7 +547,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) const u32 p3 = pw_len + salt_len + 3; - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); u32 dgst[5]; @@ -557,7 +557,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) dgst[3] = tmps[gid].dgst[init_pos][3]; dgst[4] = tmps[gid].dgst[init_pos][4]; - u32 iter = loop_pos; + u32 iter = LOOP_POS; for (u32 i = 0; i < 256; i++) { @@ -743,7 +743,7 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -824,8 +824,8 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; //const u32 salt_len = 8; @@ -890,8 +890,8 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) iv[2] = hc_swap32_S (iv[2]); iv[3] = hc_swap32_S (iv[3]); - const u32 pack_size = esalt_bufs[DIGESTS_OFFSET].pack_size; - const u32 unpack_size = esalt_bufs[DIGESTS_OFFSET].unpack_size; + const u32 pack_size = esalt_bufs[DIGESTS_OFFSET_HOST].pack_size; + const u32 unpack_size = esalt_bufs[DIGESTS_OFFSET_HOST].unpack_size; if (pack_size > unpack_size) // could be aligned { @@ -901,10 +901,10 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 last_block_encrypted[4]; - last_block_encrypted[0] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 0]; - last_block_encrypted[1] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 1]; - last_block_encrypted[2] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 2]; - last_block_encrypted[3] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 3]; + last_block_encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 0]; + last_block_encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 1]; + last_block_encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 2]; + last_block_encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 3]; u32 last_block_decrypted[4]; @@ -912,10 +912,10 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 last_block_iv[4]; - last_block_iv[0] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 0]; - last_block_iv[1] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 1]; - last_block_iv[2] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 2]; - last_block_iv[3] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 3]; + last_block_iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 0]; + last_block_iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 1]; + last_block_iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 2]; + last_block_iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 3]; last_block_decrypted[0] ^= last_block_iv[0]; last_block_decrypted[1] ^= last_block_iv[1]; @@ -934,10 +934,10 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[j + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[j + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[j + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[j + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 3]; u32 out[4]; diff --git a/OpenCL/m23700-pure.cl b/OpenCL/m23700-pure.cl index c33c5f123..ff27fbabc 100644 --- a/OpenCL/m23700-pure.cl +++ b/OpenCL/m23700-pure.cl @@ -844,7 +844,7 @@ KERNEL_FQ void m23700_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].dgst[0] = SHA1M_A; tmps[gid].dgst[1] = SHA1M_B; @@ -870,8 +870,8 @@ KERNEL_FQ void m23700_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 salt_buf[3]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); // swap needed due to -O kernel - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); // swap needed due to -O kernel + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); salt_buf[2] = 0; // switch buffer by offset (can only be 0 or 2 because of utf16): @@ -906,7 +906,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -929,7 +929,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) // update IV: - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); sha1_ctx_t ctx_iv; @@ -941,11 +941,11 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) ctx_iv.h[3] = tmps[gid].dgst[3]; ctx_iv.h[4] = tmps[gid].dgst[4]; - ctx_iv.len = loop_pos * p3; + ctx_iv.len = LOOP_POS * p3; sha1_update_rar29 (&ctx_iv, w, pw_salt_len); - memcat8c_be (ctx_iv.w0, ctx_iv.w1, ctx_iv.w2, ctx_iv.w3, ctx_iv.len, hc_swap32_S (loop_pos), ctx_iv.h); + memcat8c_be (ctx_iv.w0, ctx_iv.w1, ctx_iv.w2, ctx_iv.w3, ctx_iv.len, hc_swap32_S (LOOP_POS), ctx_iv.h); ctx_iv.len += 3; @@ -993,7 +993,7 @@ KERNEL_FQ void m23700_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) // main loop: - for (u32 i = 0, j = (loop_pos + 1); i < 16383; i++, j++) + for (u32 i = 0, j = (LOOP_POS + 1); i < 16383; i++, j++) { sha1_update_rar29 (&ctx, w, pw_salt_len); @@ -1080,7 +1080,7 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1137,8 +1137,8 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) AES128_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); - const u32 pack_size = esalt_bufs[DIGESTS_OFFSET].pack_size; - const u32 unpack_size = esalt_bufs[DIGESTS_OFFSET].unpack_size; + const u32 pack_size = esalt_bufs[DIGESTS_OFFSET_HOST].pack_size; + const u32 unpack_size = esalt_bufs[DIGESTS_OFFSET_HOST].unpack_size; if (pack_size > unpack_size) // could be aligned { @@ -1148,10 +1148,10 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 last_block_encrypted[4]; - last_block_encrypted[0] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 0]; - last_block_encrypted[1] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 1]; - last_block_encrypted[2] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 2]; - last_block_encrypted[3] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 4 + 3]; + last_block_encrypted[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 0]; + last_block_encrypted[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 1]; + last_block_encrypted[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 2]; + last_block_encrypted[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 4 + 3]; u32 last_block_decrypted[4]; @@ -1159,10 +1159,10 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) u32 last_block_iv[4]; - last_block_iv[0] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 0]; - last_block_iv[1] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 1]; - last_block_iv[2] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 2]; - last_block_iv[3] = esalt_bufs[DIGESTS_OFFSET].data[pack_size_elements - 8 + 3]; + last_block_iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 0]; + last_block_iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 1]; + last_block_iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 2]; + last_block_iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[pack_size_elements - 8 + 3]; last_block_decrypted[0] ^= last_block_iv[0]; last_block_decrypted[1] ^= last_block_iv[1]; @@ -1193,10 +1193,10 @@ KERNEL_FQ void m23700_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, rar3_t)) { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[j + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[j + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[j + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[j + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[j + 3]; u32 out[4]; diff --git a/OpenCL/m23800-optimized.cl b/OpenCL/m23800-optimized.cl index a26769e7b..833b7bfab 100644 --- a/OpenCL/m23800-optimized.cl +++ b/OpenCL/m23800-optimized.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m23800_init (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].dgst[0][0] = SHA1M_A; tmps[gid].dgst[0][1] = SHA1M_B; @@ -69,7 +69,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf[10]; @@ -88,8 +88,8 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; const u32 salt_len = 8; @@ -113,7 +113,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, PUTCHAR_BE (largeblock, p, GETCHAR (salt_buf, j)); } - PUTCHAR_BE (largeblock, p + 2, (loop_pos >> 16) & 0xff); + PUTCHAR_BE (largeblock, p + 2, (LOOP_POS >> 16) & 0xff); p += 3; } @@ -122,7 +122,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, const u32 p3 = pw_len + salt_len + 3; - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); u32 dgst[5]; @@ -132,7 +132,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, dgst[3] = tmps[gid].dgst[init_pos][3]; dgst[4] = tmps[gid].dgst[init_pos][4]; - u32 iter = loop_pos; + u32 iter = LOOP_POS; for (u32 i = 0; i < 256; i++) { @@ -311,7 +311,7 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_ SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -381,8 +381,8 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_ u32 salt_buf[2]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; //const u32 salt_len = 8; @@ -465,10 +465,10 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_ u32 data[4]; - data[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[0]); - data[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[1]); - data[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[2]); - data[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[3]); + data[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[0]); + data[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[1]); + data[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[2]); + data[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[3]); u32 out[4]; @@ -493,7 +493,7 @@ KERNEL_FQ void m23800_comp (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 crc32 = hooks[gid].crc32; diff --git a/OpenCL/m23800-pure.cl b/OpenCL/m23800-pure.cl index fb38fab7d..20ce4e216 100644 --- a/OpenCL/m23800-pure.cl +++ b/OpenCL/m23800-pure.cl @@ -755,7 +755,7 @@ KERNEL_FQ void m23800_init (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; tmps[gid].dgst[0] = SHA1M_A; tmps[gid].dgst[1] = SHA1M_B; @@ -781,8 +781,8 @@ KERNEL_FQ void m23800_init (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, u32 salt_buf[3]; - salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[0]); // swap needed due to -O kernel - salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[1]); + salt_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[0]); // swap needed due to -O kernel + salt_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[1]); salt_buf[2] = 0; // switch buffer by offset (can only be 0 or 2 because of utf16): @@ -817,7 +817,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -840,7 +840,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, // update IV: - const u32 init_pos = loop_pos / (ROUNDS / 16); + const u32 init_pos = LOOP_POS / (ROUNDS / 16); sha1_ctx_t ctx_iv; @@ -852,11 +852,11 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, ctx_iv.h[3] = tmps[gid].dgst[3]; ctx_iv.h[4] = tmps[gid].dgst[4]; - ctx_iv.len = loop_pos * p3; + ctx_iv.len = LOOP_POS * p3; sha1_update_rar29 (&ctx_iv, w, pw_salt_len); - memcat8c_be (ctx_iv.w0, ctx_iv.w1, ctx_iv.w2, ctx_iv.w3, ctx_iv.len, hc_swap32_S (loop_pos), ctx_iv.h); + memcat8c_be (ctx_iv.w0, ctx_iv.w1, ctx_iv.w2, ctx_iv.w3, ctx_iv.len, hc_swap32_S (LOOP_POS), ctx_iv.h); ctx_iv.len += 3; @@ -904,7 +904,7 @@ KERNEL_FQ void m23800_loop (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, // main loop: - for (u32 i = 0, j = (loop_pos + 1); i < 16383; i++, j++) + for (u32 i = 0, j = (LOOP_POS + 1); i < 16383; i++, j++) { sha1_update_rar29 (&ctx, w, pw_salt_len); @@ -984,7 +984,7 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_ SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -1060,10 +1060,10 @@ KERNEL_FQ void m23800_hook23 (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_ u32 data[4]; - data[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[0]); - data[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[1]); - data[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[2]); - data[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET].first_block_encrypted[3]); + data[0] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[0]); + data[1] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[1]); + data[2] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[2]); + data[3] = hc_swap32_S (esalt_bufs[DIGESTS_OFFSET_HOST].first_block_encrypted[3]); u32 out[4]; @@ -1088,7 +1088,7 @@ KERNEL_FQ void m23800_comp (KERN_ATTR_TMPS_HOOKS_ESALT (rar3_tmp_t, rar3_hook_t, const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 crc32 = hooks[gid].crc32; diff --git a/OpenCL/m23900-pure.cl b/OpenCL/m23900-pure.cl index a70d2a0ba..2f6a32359 100644 --- a/OpenCL/m23900-pure.cl +++ b/OpenCL/m23900-pure.cl @@ -33,14 +33,14 @@ KERNEL_FQ void m23900_init (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const int salt_pw_len = 8 + MIN (pws[gid].pw_len, 56); u32 comb[16]; - comb[ 0] = salt_bufs[SALT_POS].salt_buf[0]; - comb[ 1] = salt_bufs[SALT_POS].salt_buf[1]; + comb[ 0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + comb[ 1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; comb[ 2] = hc_swap32_S (pws[gid].i[ 0]); // in theory BE is faster because it comb[ 3] = hc_swap32_S (pws[gid].i[ 1]); // avoids several other byte swaps later on @@ -107,7 +107,7 @@ KERNEL_FQ void m23900_loop (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const int salt_pw_len = 8 + MIN (pws[gid].pw_len, 56); @@ -308,7 +308,7 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // final transform of sha256: @@ -365,10 +365,10 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t)) { u32 data[4]; - data[0] = esalt_bufs[DIGESTS_OFFSET].data[i + 0]; - data[1] = esalt_bufs[DIGESTS_OFFSET].data[i + 1]; - data[2] = esalt_bufs[DIGESTS_OFFSET].data[i + 2]; - data[3] = esalt_bufs[DIGESTS_OFFSET].data[i + 3]; + data[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 0]; + data[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 1]; + data[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 2]; + data[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[i + 3]; u32 out[4]; @@ -444,9 +444,9 @@ KERNEL_FQ void m23900_comp (KERN_ATTR_TMPS_ESALT (bestcrypt_tmp_t, bestcrypt_t)) (digest[2] == res[18]) && (digest[3] == res[19])) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m24100-pure.cl b/OpenCL/m24100-pure.cl index 3b2cb60f3..47842620f 100644 --- a/OpenCL/m24100-pure.cl +++ b/OpenCL/m24100-pure.cl @@ -100,13 +100,13 @@ KERNEL_FQ void m24100_init (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; md5_ctx_t md5_ctx; md5_init (&md5_ctx); - md5_update_global (&md5_ctx, esalt_bufs[DIGESTS_OFFSET].user, esalt_bufs[DIGESTS_OFFSET].user_len); + md5_update_global (&md5_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].user, esalt_bufs[DIGESTS_OFFSET_HOST].user_len); md5_update_global (&md5_ctx, pws[gid].i, pws[gid].pw_len); md5_final (&md5_ctx); @@ -153,7 +153,7 @@ KERNEL_FQ void m24100_init (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt, 16); + sha1_hmac_update_global (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt, 16); for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) { @@ -203,7 +203,7 @@ KERNEL_FQ void m24100_loop (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -237,7 +237,7 @@ KERNEL_FQ void m24100_loop (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -292,7 +292,7 @@ KERNEL_FQ void m24100_comp (KERN_ATTR_TMPS_ESALT (mongodb_sha1_tmp_t, mongodb_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m24200-pure.cl b/OpenCL/m24200-pure.cl index 0efa80e05..d6901e0a3 100644 --- a/OpenCL/m24200-pure.cl +++ b/OpenCL/m24200-pure.cl @@ -86,7 +86,7 @@ KERNEL_FQ void m24200_init (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -110,7 +110,7 @@ KERNEL_FQ void m24200_init (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_ tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt, 28); + sha256_hmac_update_global (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt, 28); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -166,7 +166,7 @@ KERNEL_FQ void m24200_loop (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -212,7 +212,7 @@ KERNEL_FQ void m24200_loop (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_ out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -276,7 +276,7 @@ KERNEL_FQ void m24200_comp (KERN_ATTR_TMPS_ESALT (mongodb_sha256_tmp_t, mongodb_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); diff --git a/OpenCL/m24300_a0-optimized.cl b/OpenCL/m24300_a0-optimized.cl index 9c494d9a8..acacfdaaf 100644 --- a/OpenCL/m24300_a0-optimized.cl +++ b/OpenCL/m24300_a0-optimized.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -84,30 +84,30 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -670,7 +670,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -699,24 +699,24 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -724,17 +724,17 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m24300_a0-pure.cl b/OpenCL/m24300_a0-pure.cl index b919bf279..0cc66b150 100644 --- a/OpenCL/m24300_a0-pure.cl +++ b/OpenCL/m24300_a0-pure.cl @@ -55,7 +55,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -67,13 +67,13 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -85,7 +85,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_RULES ()) sha1_update_swap (&ctx1, tmp.i, tmp.pw_len); - sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_final (&ctx1); @@ -169,7 +169,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_RULES ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -177,10 +177,10 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -193,13 +193,13 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_RULES ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -211,7 +211,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_RULES ()) sha1_update_swap (&ctx1, tmp.i, tmp.pw_len); - sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_final (&ctx1); diff --git a/OpenCL/m24300_a1-optimized.cl b/OpenCL/m24300_a1-optimized.cl index 21c3ce379..c1ea5bebc 100644 --- a/OpenCL/m24300_a1-optimized.cl +++ b/OpenCL/m24300_a1-optimized.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -82,30 +82,30 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -143,7 +143,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -724,7 +724,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -753,24 +753,24 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; - - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; + + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -778,17 +778,17 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -826,7 +826,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m24300_a1-pure.cl b/OpenCL/m24300_a1-pure.cl index c6b5254a0..37fa725b9 100644 --- a/OpenCL/m24300_a1-pure.cl +++ b/OpenCL/m24300_a1-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,7 +63,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -75,13 +75,13 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; sha1_update_global_swap (&ctx1, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); - sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_final (&ctx1); @@ -165,7 +165,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -173,10 +173,10 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -187,7 +187,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_BASIC ()) sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_ctx_t ctx1l; @@ -199,13 +199,13 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx1 = ctx1l; sha1_update_global_swap (&ctx1, combs_buf[il_pos].i, combs_buf[il_pos].pw_len); - sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx1, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_final (&ctx1); diff --git a/OpenCL/m24300_a3-optimized.cl b/OpenCL/m24300_a3-optimized.cl index 0054891cd..ed1541bc0 100644 --- a/OpenCL/m24300_a3-optimized.cl +++ b/OpenCL/m24300_a3-optimized.cl @@ -49,22 +49,22 @@ DECLSPEC void m24300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; salt_buf0_t[0] = salt_buf0[0]; salt_buf0_t[1] = salt_buf0[1]; @@ -83,7 +83,7 @@ DECLSPEC void m24300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3_t[2] = salt_buf3[2]; salt_buf3_t[3] = salt_buf3[3]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -114,7 +114,7 @@ DECLSPEC void m24300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -614,22 +614,22 @@ DECLSPEC void m24300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2_t[4]; u32 salt_buf3_t[4]; - salt_buf0[0] = salt_bufs[SALT_POS].salt_buf[ 0]; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 1]; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 2]; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 3]; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 4]; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 5]; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 6]; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 7]; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 8]; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 9]; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[10]; - salt_buf2[3] = salt_bufs[SALT_POS].salt_buf[11]; - salt_buf3[0] = salt_bufs[SALT_POS].salt_buf[12]; - salt_buf3[1] = salt_bufs[SALT_POS].salt_buf[13]; - salt_buf3[2] = salt_bufs[SALT_POS].salt_buf[14]; - salt_buf3[3] = salt_bufs[SALT_POS].salt_buf[15]; + salt_buf0[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 0]; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 1]; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 2]; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 3]; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 4]; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 5]; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 6]; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 7]; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 8]; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 9]; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[10]; + salt_buf2[3] = salt_bufs[SALT_POS_HOST].salt_buf[11]; + salt_buf3[0] = salt_bufs[SALT_POS_HOST].salt_buf[12]; + salt_buf3[1] = salt_bufs[SALT_POS_HOST].salt_buf[13]; + salt_buf3[2] = salt_bufs[SALT_POS_HOST].salt_buf[14]; + salt_buf3[3] = salt_bufs[SALT_POS_HOST].salt_buf[15]; salt_buf0_t[0] = salt_buf0[0]; salt_buf0_t[1] = salt_buf0[1]; @@ -648,7 +648,7 @@ DECLSPEC void m24300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER salt_buf3_t[2] = salt_buf3[2]; salt_buf3_t[3] = salt_buf3[3]; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; const u32 pw_salt_len = pw_len + salt_len; @@ -679,10 +679,10 @@ DECLSPEC void m24300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -691,7 +691,7 @@ DECLSPEC void m24300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -1195,7 +1195,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1235,7 +1235,7 @@ KERNEL_FQ void m24300_m04 (KERN_ATTR_BASIC ()) * main */ - m24300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m24300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m24300_m08 (KERN_ATTR_BASIC ()) @@ -1265,7 +1265,7 @@ KERNEL_FQ void m24300_m08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1305,7 +1305,7 @@ KERNEL_FQ void m24300_m08 (KERN_ATTR_BASIC ()) * main */ - m24300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m24300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m24300_m16 (KERN_ATTR_BASIC ()) @@ -1335,7 +1335,7 @@ KERNEL_FQ void m24300_m16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1375,7 +1375,7 @@ KERNEL_FQ void m24300_m16 (KERN_ATTR_BASIC ()) * main */ - m24300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m24300m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) @@ -1405,7 +1405,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1445,7 +1445,7 @@ KERNEL_FQ void m24300_s04 (KERN_ATTR_BASIC ()) * main */ - m24300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m24300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m24300_s08 (KERN_ATTR_BASIC ()) @@ -1475,7 +1475,7 @@ KERNEL_FQ void m24300_s08 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1515,7 +1515,7 @@ KERNEL_FQ void m24300_s08 (KERN_ATTR_BASIC ()) * main */ - m24300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m24300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } KERNEL_FQ void m24300_s16 (KERN_ATTR_BASIC ()) @@ -1545,7 +1545,7 @@ KERNEL_FQ void m24300_s16 (KERN_ATTR_BASIC ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -1585,5 +1585,5 @@ KERNEL_FQ void m24300_s16 (KERN_ATTR_BASIC ()) * main */ - m24300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max, l_bin2asc); + m24300s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, l_bin2asc); } diff --git a/OpenCL/m24300_a3-pure.cl b/OpenCL/m24300_a3-pure.cl index 0f70dc9cf..7b72fcce1 100644 --- a/OpenCL/m24300_a3-pure.cl +++ b/OpenCL/m24300_a3-pure.cl @@ -53,7 +53,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -68,20 +68,20 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -89,7 +89,7 @@ KERNEL_FQ void m24300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -189,7 +189,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_VECTOR ()) SYNC_THREADS (); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -197,10 +197,10 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -216,20 +216,20 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = hc_swap32 (salt_bufs[SALT_POS].salt_buf[idx]); + s[idx] = hc_swap32 (salt_bufs[SALT_POS_HOST].salt_buf[idx]); } sha1_ctx_t ctx0; sha1_init (&ctx0); - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -237,7 +237,7 @@ KERNEL_FQ void m24300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m24410-pure.cl b/OpenCL/m24410-pure.cl index 2d5ef5143..ffe67a9ac 100644 --- a/OpenCL/m24410-pure.cl +++ b/OpenCL/m24410-pure.cl @@ -84,7 +84,7 @@ KERNEL_FQ void m24410_init (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -102,14 +102,14 @@ KERNEL_FQ void m24410_init (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); u32 key_elem = 0; - if (esalt_bufs[DIGESTS_OFFSET].cipher == 1) { key_elem = (192 / 8) / 4; } - else if (esalt_bufs[DIGESTS_OFFSET].cipher == 2) { key_elem = (128 / 8) / 4; } - else if (esalt_bufs[DIGESTS_OFFSET].cipher == 3) { key_elem = (192 / 8) / 4; } - else if (esalt_bufs[DIGESTS_OFFSET].cipher == 4) { key_elem = (256 / 8) / 4; } + if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 1) { key_elem = (192 / 8) / 4; } + else if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 2) { key_elem = (128 / 8) / 4; } + else if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 3) { key_elem = (192 / 8) / 4; } + else if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 4) { key_elem = (256 / 8) / 4; } for (u32 i = 0, j = 1; i < key_elem; i += 5, j += 1) { @@ -159,7 +159,7 @@ KERNEL_FQ void m24410_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -178,10 +178,10 @@ KERNEL_FQ void m24410_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) u32 key_elem = 0; - if (esalt_bufs[DIGESTS_OFFSET].cipher == 1) { key_elem = (192 / 8) / 4; } - else if (esalt_bufs[DIGESTS_OFFSET].cipher == 2) { key_elem = (128 / 8) / 4; } - else if (esalt_bufs[DIGESTS_OFFSET].cipher == 3) { key_elem = (192 / 8) / 4; } - else if (esalt_bufs[DIGESTS_OFFSET].cipher == 4) { key_elem = (256 / 8) / 4; } + if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 1) { key_elem = (192 / 8) / 4; } + else if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 2) { key_elem = (128 / 8) / 4; } + else if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 3) { key_elem = (192 / 8) / 4; } + else if (esalt_bufs[DIGESTS_OFFSET_HOST].cipher == 4) { key_elem = (256 / 8) / 4; } for (u32 i = 0; i < key_elem; i += 5) { @@ -200,7 +200,7 @@ KERNEL_FQ void m24410_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -331,7 +331,7 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -344,13 +344,13 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) ukey[6] = tmps[gid].out[6]; ukey[7] = tmps[gid].out[7]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; const int last_pad_elem = last_pad_pos / 4; - const int cipher = esalt_bufs[DIGESTS_OFFSET].cipher; + const int cipher = esalt_bufs[DIGESTS_OFFSET_HOST].cipher; u32 iv[4]; @@ -379,11 +379,11 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; u32 p1[2]; u32 p2[2]; @@ -401,11 +401,11 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; _des_crypt_decrypt (p1, enc, K4, K5, s_SPtrans); _des_crypt_encrypt (p2, p1, K2, K3, s_SPtrans); @@ -428,15 +428,15 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; aes128_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -451,15 +451,15 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; aes128_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -482,15 +482,15 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; aes192_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -505,15 +505,15 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; aes192_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -536,15 +536,15 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; aes256_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -559,15 +559,15 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; aes256_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -587,10 +587,10 @@ KERNEL_FQ void m24410_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha1_tmp_t, pkcs_t)) return; } - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - const u32 r1 = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - const u32 r2 = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - const u32 r3 = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + const u32 r1 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + const u32 r2 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + const u32 r3 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; #define il_pos 0 diff --git a/OpenCL/m24420-pure.cl b/OpenCL/m24420-pure.cl index 2e2569428..b87fe96a4 100644 --- a/OpenCL/m24420-pure.cl +++ b/OpenCL/m24420-pure.cl @@ -90,7 +90,7 @@ KERNEL_FQ void m24420_init (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -114,7 +114,7 @@ KERNEL_FQ void m24420_init (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -170,7 +170,7 @@ KERNEL_FQ void m24420_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -216,7 +216,7 @@ KERNEL_FQ void m24420_loop (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -356,7 +356,7 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -369,13 +369,13 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) ukey[6] = tmps[gid].out[6]; ukey[7] = tmps[gid].out[7]; - const int data_len = esalt_bufs[DIGESTS_OFFSET].data_len; + const int data_len = esalt_bufs[DIGESTS_OFFSET_HOST].data_len; const int last_pad_pos = data_len - 1; const int last_pad_elem = last_pad_pos / 4; - const int cipher = esalt_bufs[DIGESTS_OFFSET].cipher; + const int cipher = esalt_bufs[DIGESTS_OFFSET_HOST].cipher; u32 iv[4]; @@ -404,11 +404,11 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; u32 p1[2]; u32 p2[2]; @@ -426,11 +426,11 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; _des_crypt_decrypt (p1, enc, K4, K5, s_SPtrans); _des_crypt_encrypt (p2, p1, K2, K3, s_SPtrans); @@ -453,15 +453,15 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; aes128_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -476,15 +476,15 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; aes128_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -507,15 +507,15 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; aes192_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -530,15 +530,15 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; aes192_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -561,15 +561,15 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // first check the padding - iv[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 7]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 6]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 5]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 4]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 7]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 6]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 5]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 3]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 2]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 1]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[last_pad_elem - 0]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 3]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 2]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 1]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[last_pad_elem - 0]; aes256_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -584,15 +584,15 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) // second check (naive code) ASN.1 structure - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; aes256_decrypt (ks, enc, dec, s_td0, s_td1, s_td2, s_td3, s_td4); @@ -612,10 +612,10 @@ KERNEL_FQ void m24420_comp (KERN_ATTR_TMPS_ESALT (pkcs_sha256_tmp_t, pkcs_t)) return; } - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - const u32 r1 = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - const u32 r2 = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - const u32 r3 = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + const u32 r1 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + const u32 r2 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + const u32 r3 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; #define il_pos 0 diff --git a/OpenCL/m24500-pure.cl b/OpenCL/m24500-pure.cl index def16b997..d019c15a9 100644 --- a/OpenCL/m24500-pure.cl +++ b/OpenCL/m24500-pure.cl @@ -139,17 +139,17 @@ KERNEL_FQ void m24500_init (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; - const u32 salt_len = salt_bufs[SALT_POS].salt_len; // 32 + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; // 32 sha512_ctx_t sha512_ctx; sha512_init (&sha512_ctx); - sha512_update_global (&sha512_ctx, salt_bufs[SALT_POS].salt_buf, salt_len); + sha512_update_global (&sha512_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_len); sha512_update_global_swap (&sha512_ctx, pws[gid].i, pws[gid].pw_len); - sha512_update_global (&sha512_ctx, salt_bufs[SALT_POS].salt_buf, salt_len); + sha512_update_global (&sha512_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_len); sha512_final (&sha512_ctx); @@ -194,7 +194,7 @@ KERNEL_FQ void m24500_init (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 24; i += 8, j += 1) { @@ -270,7 +270,7 @@ KERNEL_FQ void m24500_loop (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -316,7 +316,7 @@ KERNEL_FQ void m24500_loop (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -453,14 +453,14 @@ KERNEL_FQ void m24500_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 data_key[4]; - data_key[0] = esalt_bufs[DIGESTS_OFFSET].data[0]; - data_key[1] = esalt_bufs[DIGESTS_OFFSET].data[1]; - data_key[2] = esalt_bufs[DIGESTS_OFFSET].data[2]; - data_key[3] = esalt_bufs[DIGESTS_OFFSET].data[3]; + data_key[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[0]; + data_key[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[1]; + data_key[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[2]; + data_key[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[3]; u32 data_a[12]; u32 data_b[12]; @@ -594,10 +594,10 @@ KERNEL_FQ void m24500_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) { u32 x[4]; - x[0] = esalt_bufs[DIGESTS_OFFSET].data[4 + i]; - x[1] = esalt_bufs[DIGESTS_OFFSET].data[5 + i]; - x[2] = esalt_bufs[DIGESTS_OFFSET].data[6 + i]; - x[3] = esalt_bufs[DIGESTS_OFFSET].data[7 + i]; + x[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data[4 + i]; + x[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data[5 + i]; + x[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data[6 + i]; + x[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data[7 + i]; u32 y[4]; @@ -646,9 +646,9 @@ KERNEL_FQ void m24500_comp (KERN_ATTR_TMPS_ESALT (telegram_tmp_t, telegram_t)) r2 == data_key[2] && r3 == data_key[3]) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } } } diff --git a/OpenCL/m24610-pure.cl b/OpenCL/m24610-pure.cl index aad6b6729..bdb99151e 100644 --- a/OpenCL/m24610-pure.cl +++ b/OpenCL/m24610-pure.cl @@ -81,7 +81,7 @@ KERNEL_FQ void m24610_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -99,7 +99,7 @@ KERNEL_FQ void m24610_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -149,7 +149,7 @@ KERNEL_FQ void m24610_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -183,7 +183,7 @@ KERNEL_FQ void m24610_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -287,7 +287,7 @@ KERNEL_FQ void m24610_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -308,17 +308,17 @@ KERNEL_FQ void m24610_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe u32 iv_buf[4]; - iv_buf[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv_buf[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv_buf[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv_buf[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; u32 dec[4]; @@ -333,10 +333,10 @@ KERNEL_FQ void m24610_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha1_tmp_t, sqlciphe if (dec[1] != 0) return; if (dec[2] != 0) return; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - const u32 r1 = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - const u32 r2 = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - const u32 r3 = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + const u32 r1 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + const u32 r2 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + const u32 r3 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; #define il_pos 0 diff --git a/OpenCL/m24620-pure.cl b/OpenCL/m24620-pure.cl index da67ba36d..a280530df 100644 --- a/OpenCL/m24620-pure.cl +++ b/OpenCL/m24620-pure.cl @@ -87,7 +87,7 @@ KERNEL_FQ void m24620_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -111,7 +111,7 @@ KERNEL_FQ void m24620_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -167,7 +167,7 @@ KERNEL_FQ void m24620_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -213,7 +213,7 @@ KERNEL_FQ void m24620_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -326,7 +326,7 @@ KERNEL_FQ void m24620_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -347,17 +347,17 @@ KERNEL_FQ void m24620_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip u32 iv_buf[4]; - iv_buf[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv_buf[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv_buf[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv_buf[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; u32 dec[4]; @@ -372,10 +372,10 @@ KERNEL_FQ void m24620_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha256_tmp_t, sqlcip if (dec[1] != 0) return; if (dec[2] != 0) return; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - const u32 r1 = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - const u32 r2 = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - const u32 r3 = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + const u32 r1 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + const u32 r2 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + const u32 r3 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; #define il_pos 0 diff --git a/OpenCL/m24630-pure.cl b/OpenCL/m24630-pure.cl index c54ca9a0b..ea58d5285 100644 --- a/OpenCL/m24630-pure.cl +++ b/OpenCL/m24630-pure.cl @@ -103,7 +103,7 @@ KERNEL_FQ void m24630_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_hmac_ctx_t sha512_hmac_ctx; @@ -127,7 +127,7 @@ KERNEL_FQ void m24630_init (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; - sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_hmac_update_global_swap (&sha512_hmac_ctx, salt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -203,7 +203,7 @@ KERNEL_FQ void m24630_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x ipad[8]; u64x opad[8]; @@ -249,7 +249,7 @@ KERNEL_FQ void m24630_loop (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip out[6] = pack64v (tmps, out, gid, i + 6); out[7] = pack64v (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -382,7 +382,7 @@ KERNEL_FQ void m24630_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -403,17 +403,17 @@ KERNEL_FQ void m24630_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip u32 iv_buf[4]; - iv_buf[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv_buf[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv_buf[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv_buf[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; u32 enc[4]; - enc[0] = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - enc[1] = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - enc[2] = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - enc[3] = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + enc[0] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + enc[1] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + enc[2] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + enc[3] = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; u32 dec[4]; @@ -428,10 +428,10 @@ KERNEL_FQ void m24630_comp (KERN_ATTR_TMPS_ESALT (sqlcipher_sha512_tmp_t, sqlcip if (dec[1] != 0) return; if (dec[2] != 0) return; - const u32 r0 = esalt_bufs[DIGESTS_OFFSET].data_buf[0]; - const u32 r1 = esalt_bufs[DIGESTS_OFFSET].data_buf[1]; - const u32 r2 = esalt_bufs[DIGESTS_OFFSET].data_buf[2]; - const u32 r3 = esalt_bufs[DIGESTS_OFFSET].data_buf[3]; + const u32 r0 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[0]; + const u32 r1 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[1]; + const u32 r2 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[2]; + const u32 r3 = esalt_bufs[DIGESTS_OFFSET_HOST].data_buf[3]; #define il_pos 0 diff --git a/OpenCL/m24700_a0-optimized.cl b/OpenCL/m24700_a0-optimized.cl index 50bc227b3..17a603b3c 100644 --- a/OpenCL/m24700_a0-optimized.cl +++ b/OpenCL/m24700_a0-optimized.cl @@ -24,7 +24,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -48,7 +48,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -256,7 +256,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -282,8 +282,8 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -292,7 +292,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m24700_a0-pure.cl b/OpenCL/m24700_a0-pure.cl index 796eca01d..d229cafec 100644 --- a/OpenCL/m24700_a0-pure.cl +++ b/OpenCL/m24700_a0-pure.cl @@ -24,7 +24,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -36,7 +36,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -81,7 +81,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -89,8 +89,8 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -105,7 +105,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m24700_a1-optimized.cl b/OpenCL/m24700_a1-optimized.cl index c9570e955..ad46f881d 100644 --- a/OpenCL/m24700_a1-optimized.cl +++ b/OpenCL/m24700_a1-optimized.cl @@ -22,7 +22,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -46,7 +46,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -84,7 +84,7 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -313,7 +313,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -339,8 +339,8 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -349,7 +349,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -387,7 +387,7 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m24700_a1-pure.cl b/OpenCL/m24700_a1-pure.cl index 3e2fbf662..53903e9f6 100644 --- a/OpenCL/m24700_a1-pure.cl +++ b/OpenCL/m24700_a1-pure.cl @@ -22,7 +22,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -38,7 +38,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; @@ -77,7 +77,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -85,8 +85,8 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -105,7 +105,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { md5_ctx_t ctx1 = ctx0; diff --git a/OpenCL/m24700_a3-optimized.cl b/OpenCL/m24700_a3-optimized.cl index aaaddf8fb..6dc0ab2cc 100644 --- a/OpenCL/m24700_a3-optimized.cl +++ b/OpenCL/m24700_a3-optimized.cl @@ -28,7 +28,7 @@ DECLSPEC void m24700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -252,8 +252,8 @@ DECLSPEC void m24700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -264,7 +264,7 @@ DECLSPEC void m24700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -519,13 +519,13 @@ KERNEL_FQ void m24700_m04 (KERN_ATTR_BASIC ()) const u32 pw_len = pws[gid].pw_len & 63; - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m24700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24700_m08 (KERN_ATTR_BASIC ()) @@ -570,13 +570,13 @@ KERNEL_FQ void m24700_m08 (KERN_ATTR_BASIC ()) const u32 pw_len = pws[gid].pw_len & 63; - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m24700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24700_m16 (KERN_ATTR_BASIC ()) @@ -621,13 +621,13 @@ KERNEL_FQ void m24700_m16 (KERN_ATTR_BASIC ()) const u32 pw_len = pws[gid].pw_len & 63; - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m24700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24700m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ()) @@ -672,13 +672,13 @@ KERNEL_FQ void m24700_s04 (KERN_ATTR_BASIC ()) const u32 pw_len = pws[gid].pw_len & 63; - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m24700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24700_s08 (KERN_ATTR_BASIC ()) @@ -723,13 +723,13 @@ KERNEL_FQ void m24700_s08 (KERN_ATTR_BASIC ()) const u32 pw_len = pws[gid].pw_len & 63; - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m24700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24700_s16 (KERN_ATTR_BASIC ()) @@ -774,11 +774,11 @@ KERNEL_FQ void m24700_s16 (KERN_ATTR_BASIC ()) const u32 pw_len = pws[gid].pw_len & 63; - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * main */ - m24700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24700s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m24700_a3-pure.cl b/OpenCL/m24700_a3-pure.cl index 9942c4415..82034a5fc 100644 --- a/OpenCL/m24700_a3-pure.cl +++ b/OpenCL/m24700_a3-pure.cl @@ -22,7 +22,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -43,7 +43,7 @@ KERNEL_FQ void m24700_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -90,7 +90,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -98,8 +98,8 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -123,7 +123,7 @@ KERNEL_FQ void m24700_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m24800_a0-optimized.cl b/OpenCL/m24800_a0-optimized.cl index 9ef086f7c..21049a243 100644 --- a/OpenCL/m24800_a0-optimized.cl +++ b/OpenCL/m24800_a0-optimized.cl @@ -119,7 +119,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -139,7 +139,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -241,7 +241,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -263,17 +263,17 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m24800_a0-pure.cl b/OpenCL/m24800_a0-pure.cl index da2cbc112..7034e9f1c 100644 --- a/OpenCL/m24800_a0-pure.cl +++ b/OpenCL/m24800_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,7 +37,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -79,7 +79,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -87,10 +87,10 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -103,7 +103,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m24800_a1-optimized.cl b/OpenCL/m24800_a1-optimized.cl index 02451900c..27b7f7d7b 100644 --- a/OpenCL/m24800_a1-optimized.cl +++ b/OpenCL/m24800_a1-optimized.cl @@ -117,7 +117,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -137,7 +137,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -177,7 +177,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -291,7 +291,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -313,17 +313,17 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -363,7 +363,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m24800_a1-pure.cl b/OpenCL/m24800_a1-pure.cl index da321e287..3a6141cbc 100644 --- a/OpenCL/m24800_a1-pure.cl +++ b/OpenCL/m24800_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -102,7 +102,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -110,10 +110,10 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -133,7 +133,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m24800_a3-optimized.cl b/OpenCL/m24800_a3-optimized.cl index de5ad3649..e8588cf7b 100644 --- a/OpenCL/m24800_a3-optimized.cl +++ b/OpenCL/m24800_a3-optimized.cl @@ -118,7 +118,7 @@ DECLSPEC void m24800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -225,10 +225,10 @@ DECLSPEC void m24800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -237,7 +237,7 @@ DECLSPEC void m24800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 w0l = w0[0]; - 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); @@ -337,7 +337,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -373,7 +373,7 @@ KERNEL_FQ void m24800_m04 (KERN_ATTR_BASIC ()) * main */ - m24800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24800_m08 (KERN_ATTR_BASIC ()) @@ -384,7 +384,7 @@ KERNEL_FQ void m24800_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -420,7 +420,7 @@ KERNEL_FQ void m24800_m08 (KERN_ATTR_BASIC ()) * main */ - m24800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24800_m16 (KERN_ATTR_BASIC ()) @@ -431,7 +431,7 @@ KERNEL_FQ void m24800_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -467,7 +467,7 @@ KERNEL_FQ void m24800_m16 (KERN_ATTR_BASIC ()) * main */ - m24800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24800m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ()) @@ -478,7 +478,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -514,7 +514,7 @@ KERNEL_FQ void m24800_s04 (KERN_ATTR_BASIC ()) * main */ - m24800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24800_s08 (KERN_ATTR_BASIC ()) @@ -525,7 +525,7 @@ KERNEL_FQ void m24800_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -561,7 +561,7 @@ KERNEL_FQ void m24800_s08 (KERN_ATTR_BASIC ()) * main */ - m24800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24800_s16 (KERN_ATTR_BASIC ()) @@ -572,7 +572,7 @@ KERNEL_FQ void m24800_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -608,5 +608,5 @@ KERNEL_FQ void m24800_s16 (KERN_ATTR_BASIC ()) * main */ - m24800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24800s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m24800_a3-pure.cl b/OpenCL/m24800_a3-pure.cl index 9d2bbc0ad..711192165 100644 --- a/OpenCL/m24800_a3-pure.cl +++ b/OpenCL/m24800_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -44,7 +44,7 @@ KERNEL_FQ void m24800_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -88,7 +88,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -96,10 +96,10 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -121,7 +121,7 @@ KERNEL_FQ void m24800_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m24900_a0-optimized.cl b/OpenCL/m24900_a0-optimized.cl index 312691021..3e28ffdc1 100644 --- a/OpenCL/m24900_a0-optimized.cl +++ b/OpenCL/m24900_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -50,7 +50,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -184,7 +184,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -206,17 +206,17 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m24900_a1-optimized.cl b/OpenCL/m24900_a1-optimized.cl index a25797ee2..11423230b 100644 --- a/OpenCL/m24900_a1-optimized.cl +++ b/OpenCL/m24900_a1-optimized.cl @@ -29,7 +29,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -49,7 +49,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -87,7 +87,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -242,7 +242,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -264,17 +264,17 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -312,7 +312,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m24900_a3-optimized.cl b/OpenCL/m24900_a3-optimized.cl index dd2d17f69..b6ad4802c 100644 --- a/OpenCL/m24900_a3-optimized.cl +++ b/OpenCL/m24900_a3-optimized.cl @@ -29,7 +29,7 @@ DECLSPEC void m24900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -174,10 +174,10 @@ DECLSPEC void m24900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3], }; /** @@ -186,7 +186,7 @@ DECLSPEC void m24900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -324,7 +324,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -360,7 +360,7 @@ KERNEL_FQ void m24900_m04 (KERN_ATTR_BASIC ()) * main */ - m24900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24900_m08 (KERN_ATTR_BASIC ()) @@ -371,7 +371,7 @@ KERNEL_FQ void m24900_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -407,7 +407,7 @@ KERNEL_FQ void m24900_m08 (KERN_ATTR_BASIC ()) * main */ - m24900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24900_m16 (KERN_ATTR_BASIC ()) @@ -418,7 +418,7 @@ KERNEL_FQ void m24900_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -454,7 +454,7 @@ KERNEL_FQ void m24900_m16 (KERN_ATTR_BASIC ()) * main */ - m24900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24900m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ()) @@ -465,7 +465,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -501,7 +501,7 @@ KERNEL_FQ void m24900_s04 (KERN_ATTR_BASIC ()) * main */ - m24900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24900_s08 (KERN_ATTR_BASIC ()) @@ -512,7 +512,7 @@ KERNEL_FQ void m24900_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -548,7 +548,7 @@ KERNEL_FQ void m24900_s08 (KERN_ATTR_BASIC ()) * main */ - m24900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m24900_s16 (KERN_ATTR_BASIC ()) @@ -559,7 +559,7 @@ KERNEL_FQ void m24900_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -595,5 +595,5 @@ KERNEL_FQ void m24900_s16 (KERN_ATTR_BASIC ()) * main */ - m24900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m24900s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m25000-pure.cl b/OpenCL/m25000-pure.cl index 491f9a2b6..192e69f96 100644 --- a/OpenCL/m25000-pure.cl +++ b/OpenCL/m25000-pure.cl @@ -67,7 +67,7 @@ KERNEL_FQ void m25000_init (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -173,7 +173,7 @@ KERNEL_FQ void m25000_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 h_md5[4]; @@ -205,7 +205,7 @@ KERNEL_FQ void m25000_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) tmp_shared[i] = tmps[gid].tmp_md5[i]; } - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -241,7 +241,7 @@ KERNEL_FQ void m25000_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) tmp_shared[i] = tmps[gid].tmp_sha1[i]; } - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -272,7 +272,7 @@ KERNEL_FQ void m25000_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) } else { - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -345,7 +345,7 @@ KERNEL_FQ void m25000_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -461,9 +461,9 @@ KERNEL_FQ void m25000_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) // engineID - md5_update_global (&md5_ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + md5_update_global (&md5_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); - sha1_update_global_swap (&sha1_ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + sha1_update_global_swap (&sha1_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); // md5 @@ -533,7 +533,7 @@ KERNEL_FQ void m25000_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) md5_hmac_init (&md5_hmac_ctx, w, 16); - md5_hmac_update_global (&md5_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + md5_hmac_update_global (&md5_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); md5_hmac_final (&md5_hmac_ctx); @@ -573,7 +573,7 @@ KERNEL_FQ void m25000_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) sha1_hmac_init (&sha1_hmac_ctx, w, 20); - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&sha1_hmac_ctx); diff --git a/OpenCL/m25100-pure.cl b/OpenCL/m25100-pure.cl index dba63622e..2fe4e3616 100644 --- a/OpenCL/m25100-pure.cl +++ b/OpenCL/m25100-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m25100_init (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -139,7 +139,7 @@ KERNEL_FQ void m25100_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 h[4]; @@ -161,7 +161,7 @@ KERNEL_FQ void m25100_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) tmp[i] = tmps[gid].tmp[i]; } - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -192,7 +192,7 @@ KERNEL_FQ void m25100_loop (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) } else { - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -236,7 +236,7 @@ KERNEL_FQ void m25100_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -294,7 +294,7 @@ KERNEL_FQ void m25100_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) md5_update (&ctx, w, 16); - md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + md5_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); w[ 0] = h[0]; w[ 1] = h[1]; @@ -338,7 +338,7 @@ KERNEL_FQ void m25100_comp (KERN_ATTR_TMPS_ESALT (hmac_md5_tmp_t, snmpv3_t)) md5_hmac_init (&hmac_ctx, w, 16); - md5_hmac_update_global (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + md5_hmac_update_global (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); md5_hmac_final (&hmac_ctx); diff --git a/OpenCL/m25200-pure.cl b/OpenCL/m25200-pure.cl index 3acb85572..bebc4b25a 100644 --- a/OpenCL/m25200-pure.cl +++ b/OpenCL/m25200-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m25200_init (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -140,7 +140,7 @@ KERNEL_FQ void m25200_loop (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 h[5]; @@ -163,7 +163,7 @@ KERNEL_FQ void m25200_loop (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) tmp[i] = tmps[gid].tmp[i]; } - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -194,7 +194,7 @@ KERNEL_FQ void m25200_loop (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) } else { - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -239,7 +239,7 @@ KERNEL_FQ void m25200_comp (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -298,7 +298,7 @@ KERNEL_FQ void m25200_comp (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) sha1_update (&ctx, w, 20); - sha1_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + sha1_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); w[ 0] = h[0]; w[ 1] = h[1]; @@ -342,7 +342,7 @@ KERNEL_FQ void m25200_comp (KERN_ATTR_TMPS_ESALT (hmac_sha1_tmp_t, snmpv3_t)) sha1_hmac_init (&hmac_ctx, w, 20); - sha1_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha1_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha1_hmac_final (&hmac_ctx); diff --git a/OpenCL/m25300-pure.cl b/OpenCL/m25300-pure.cl index ef23a0446..5d453c142 100644 --- a/OpenCL/m25300-pure.cl +++ b/OpenCL/m25300-pure.cl @@ -31,13 +31,13 @@ KERNEL_FQ void m25300_init (KERN_ATTR_TMPS (office2016_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha512_ctx_t ctx; sha512_init (&ctx); - sha512_update_global_swap (&ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha512_update_global_swap (&ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha512_update_global_utf16le_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -57,7 +57,7 @@ KERNEL_FQ void m25300_loop (KERN_ATTR_TMPS (office2016_tmp_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u64x t0 = pack64v (tmps, out, gid, 0); u64x t1 = pack64v (tmps, out, gid, 1); @@ -110,7 +110,7 @@ KERNEL_FQ void m25300_loop (KERN_ATTR_TMPS (office2016_tmp_t)) w7[2] = 0; w7[3] = (64 + 4) * 8; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { w0[0] = h32_from_64 (t0); w0[1] = l32_from_64 (t0); @@ -167,7 +167,7 @@ KERNEL_FQ void m25300_comp (KERN_ATTR_TMPS (office2016_tmp_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 r0 = l32_from_64_S (tmps[gid].out[7]); const u32 r1 = h32_from_64_S (tmps[gid].out[7]); diff --git a/OpenCL/m25400-pure.cl b/OpenCL/m25400-pure.cl index 83abeb579..05bf362f2 100644 --- a/OpenCL/m25400-pure.cl +++ b/OpenCL/m25400-pure.cl @@ -56,7 +56,7 @@ KERNEL_FQ void m25400_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) const u64 gid = get_global_id (0); //const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -90,19 +90,19 @@ KERNEL_FQ void m25400_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) * shared */ - u32 P = esalt_bufs[DIGESTS_OFFSET].P; // TODO this is never used, but should be according according to "Algorithm 3.2 Computing an encryption key" line 4. + u32 P = esalt_bufs[DIGESTS_OFFSET_HOST].P; // TODO this is never used, but should be according according to "Algorithm 3.2 Computing an encryption key" line 4. u32 id_buf[12]; // TODO this is never used, but should be according according to "Algorithm 3.2 Computing an encryption key" line 5. - id_buf[ 0] = esalt_bufs[DIGESTS_OFFSET].id_buf[0]; - id_buf[ 1] = esalt_bufs[DIGESTS_OFFSET].id_buf[1]; - id_buf[ 2] = esalt_bufs[DIGESTS_OFFSET].id_buf[2]; - id_buf[ 3] = esalt_bufs[DIGESTS_OFFSET].id_buf[3]; + id_buf[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[0]; + id_buf[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[1]; + id_buf[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[2]; + id_buf[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[3]; - id_buf[ 4] = esalt_bufs[DIGESTS_OFFSET].id_buf[4]; - id_buf[ 5] = esalt_bufs[DIGESTS_OFFSET].id_buf[5]; - id_buf[ 6] = esalt_bufs[DIGESTS_OFFSET].id_buf[6]; - id_buf[ 7] = esalt_bufs[DIGESTS_OFFSET].id_buf[7]; + id_buf[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[4]; + id_buf[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[5]; + id_buf[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[6]; + id_buf[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].id_buf[7]; id_buf[ 8] = 0; id_buf[ 9] = 0; @@ -194,7 +194,7 @@ KERNEL_FQ void m25400_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * shared @@ -218,7 +218,7 @@ KERNEL_FQ void m25400_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) out[2] = tmps[gid].out[2]; out[3] = tmps[gid].out[3]; - for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i++, j++) { if (j < 50) { @@ -255,10 +255,10 @@ KERNEL_FQ void m25400_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) } } - out[0] = esalt_bufs[DIGESTS_OFFSET].o_buf[0]; // store original o-value in out (scratchpad) - out[1] = esalt_bufs[DIGESTS_OFFSET].o_buf[1]; - out[2] = esalt_bufs[DIGESTS_OFFSET].o_buf[2]; - out[3] = esalt_bufs[DIGESTS_OFFSET].o_buf[3]; + out[0] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0]; // store original o-value in out (scratchpad) + out[1] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1]; + out[2] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[2]; + out[3] = esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[3]; u32 o_rc4_decryption_key[4]; o_rc4_decryption_key[0] = digest[0]; // store the owner-key o_rc4_decryption_key[1] = digest[1]; @@ -303,8 +303,8 @@ KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) { const u32 digest[4] = { - esalt_bufs[DIGESTS_OFFSET].o_buf[0], - esalt_bufs[DIGESTS_OFFSET].o_buf[1], + esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[0], + esalt_bufs[DIGESTS_OFFSET_HOST].o_buf[1], 0x0,// apparently only the first 16 bytes of the digest are used to look it up? 0x0 // apparently only the first 16 bytes of the digest are used to look it up? }; @@ -326,7 +326,7 @@ KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) */ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -405,15 +405,15 @@ KERNEL_FQ void m25400_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) if (correct) { - int digest_pos = find_hash (digest, digests_cnt, &digests_buf[DIGESTS_OFFSET]); + int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]); if (digest_pos != -1) { - const u32 final_hash_pos = DIGESTS_OFFSET + digest_pos; + const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos; if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, digest_pos, final_hash_pos, gid, il_pos, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0); } } } diff --git a/OpenCL/m25500-pure.cl b/OpenCL/m25500-pure.cl index 81e1ba4b6..959f0d918 100644 --- a/OpenCL/m25500-pure.cl +++ b/OpenCL/m25500-pure.cl @@ -89,7 +89,7 @@ KERNEL_FQ void m25500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -113,7 +113,7 @@ KERNEL_FQ void m25500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -169,7 +169,7 @@ KERNEL_FQ void m25500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -215,7 +215,7 @@ KERNEL_FQ void m25500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -310,7 +310,7 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // keys @@ -335,13 +335,13 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh // iv const u32 iv[4] = { - esalt_bufs[DIGESTS_OFFSET].iv_buf[0], - esalt_bufs[DIGESTS_OFFSET].iv_buf[1], - esalt_bufs[DIGESTS_OFFSET].iv_buf[2], - esalt_bufs[DIGESTS_OFFSET].iv_buf[3] + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3] }; - const u32 iv_len = esalt_bufs[DIGESTS_OFFSET].iv_len; + const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len; u32 J0[4] = { 0 }; @@ -352,22 +352,22 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh /* u32 enc[14] = { 0 }; - enc[ 0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 0]; - enc[ 1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 1]; - enc[ 2] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 2]; - enc[ 3] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 3]; - enc[ 4] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 4]; - enc[ 5] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 5]; - enc[ 6] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 6]; - enc[ 7] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 7]; - enc[ 8] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 8]; - enc[ 9] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 9]; - enc[10] = esalt_bufs[DIGESTS_OFFSET].ct_buf[10]; - enc[11] = esalt_bufs[DIGESTS_OFFSET].ct_buf[11]; - enc[12] = esalt_bufs[DIGESTS_OFFSET].ct_buf[12]; - enc[13] = esalt_bufs[DIGESTS_OFFSET].ct_buf[13]; - - u32 enc_len = esalt_bufs[DIGESTS_OFFSET].ct_len; + enc[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 0]; + enc[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 1]; + enc[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 2]; + enc[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 3]; + enc[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 4]; + enc[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 5]; + enc[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 6]; + enc[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 7]; + enc[ 8] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 8]; + enc[ 9] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 9]; + enc[10] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[10]; + enc[11] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[11]; + enc[12] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[12]; + enc[13] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[13]; + + u32 enc_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_len; */ /* @@ -386,7 +386,7 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh //AES_GCM_GHASH (subKey, aad_buf, aad_len, enc, enc_len, S); - AES_GCM_GHASH_GLOBAL (subKey, aad_buf, aad_len, esalt_bufs[DIGESTS_OFFSET].ct_buf, esalt_bufs[DIGESTS_OFFSET].ct_len, S); + AES_GCM_GHASH_GLOBAL (subKey, aad_buf, aad_len, esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf, esalt_bufs[DIGESTS_OFFSET_HOST].ct_len, S); AES_GCM_GCTR (key, J0, S, S_len, T, s_te0, s_te1, s_te2, s_te3, s_te4); @@ -442,7 +442,7 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // keys @@ -468,10 +468,10 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh // iv const u32 iv[4] = { - esalt_bufs[DIGESTS_OFFSET].iv_buf[0], - esalt_bufs[DIGESTS_OFFSET].iv_buf[1], - esalt_bufs[DIGESTS_OFFSET].iv_buf[2], - esalt_bufs[DIGESTS_OFFSET].iv_buf[3] + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3] }; u32 J0[4] = { @@ -485,22 +485,22 @@ KERNEL_FQ void m25500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh u32 enc[14] = { 0 }; - enc[ 0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 0]; - enc[ 1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 1]; - enc[ 2] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 2]; - enc[ 3] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 3]; - enc[ 4] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 4]; - enc[ 5] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 5]; - enc[ 6] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 6]; - enc[ 7] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 7]; - enc[ 8] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 8]; - enc[ 9] = esalt_bufs[DIGESTS_OFFSET].ct_buf[ 9]; - enc[10] = esalt_bufs[DIGESTS_OFFSET].ct_buf[10]; - enc[11] = esalt_bufs[DIGESTS_OFFSET].ct_buf[11]; - enc[12] = esalt_bufs[DIGESTS_OFFSET].ct_buf[12]; - enc[13] = esalt_bufs[DIGESTS_OFFSET].ct_buf[13]; - - u32 enc_len = esalt_bufs[DIGESTS_OFFSET].ct_len; + enc[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 0]; + enc[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 1]; + enc[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 2]; + enc[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 3]; + enc[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 4]; + enc[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 5]; + enc[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 6]; + enc[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 7]; + enc[ 8] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 8]; + enc[ 9] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[ 9]; + enc[10] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[10]; + enc[11] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[11]; + enc[12] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[12]; + enc[13] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[13]; + + u32 enc_len = esalt_bufs[DIGESTS_OFFSET_HOST].ct_len; u32 S[4] = { 0 }; diff --git a/OpenCL/m25600-pure.cl b/OpenCL/m25600-pure.cl index 3726100fb..5bb283556 100644 --- a/OpenCL/m25600-pure.cl +++ b/OpenCL/m25600-pure.cl @@ -456,7 +456,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_init (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; md5_ctx_t ctx0; @@ -532,10 +532,10 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_init (KERN_ATTR_TMPS u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 P[18]; @@ -695,7 +695,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_loop (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load @@ -748,10 +748,10 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_loop (KERN_ATTR_TMPS u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * main loop @@ -760,7 +760,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_loop (KERN_ATTR_TMPS u32 L0; u32 R0; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { for (u32 i = 0; i < 18; i++) { @@ -898,7 +898,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_comp (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load diff --git a/OpenCL/m25700_a0-optimized.cl b/OpenCL/m25700_a0-optimized.cl index ef1050c0c..ebf59ed49 100644 --- a/OpenCL/m25700_a0-optimized.cl +++ b/OpenCL/m25700_a0-optimized.cl @@ -70,7 +70,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -90,13 +90,13 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_RULES ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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) { u32x w[16] = { 0 }; @@ -135,7 +135,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -157,7 +157,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -167,13 +167,13 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_RULES ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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) { u32x w[16] = { 0 }; diff --git a/OpenCL/m25700_a1-optimized.cl b/OpenCL/m25700_a1-optimized.cl index 3996786dd..424ea372a 100644 --- a/OpenCL/m25700_a1-optimized.cl +++ b/OpenCL/m25700_a1-optimized.cl @@ -64,7 +64,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -88,13 +88,13 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_BASIC ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -132,7 +132,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -185,7 +185,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -209,7 +209,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_BASIC ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -217,7 +217,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -227,7 +227,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -265,7 +265,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m25700_a3-optimized.cl b/OpenCL/m25700_a3-optimized.cl index 783cf4fef..f1bb50115 100644 --- a/OpenCL/m25700_a3-optimized.cl +++ b/OpenCL/m25700_a3-optimized.cl @@ -88,7 +88,7 @@ DECLSPEC void m25700m (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -96,7 +96,7 @@ DECLSPEC void m25700m (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -128,7 +128,7 @@ DECLSPEC void m25700s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -138,7 +138,7 @@ DECLSPEC void m25700s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -146,7 +146,7 @@ DECLSPEC void m25700s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -171,7 +171,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -198,7 +198,7 @@ KERNEL_FQ void m25700_m04 (KERN_ATTR_VECTOR ()) * main */ - m25700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m25700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m25700_m08 (KERN_ATTR_VECTOR ()) @@ -209,7 +209,7 @@ KERNEL_FQ void m25700_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -236,7 +236,7 @@ KERNEL_FQ void m25700_m08 (KERN_ATTR_VECTOR ()) * main */ - m25700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m25700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m25700_m16 (KERN_ATTR_VECTOR ()) @@ -247,7 +247,7 @@ KERNEL_FQ void m25700_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -274,7 +274,7 @@ KERNEL_FQ void m25700_m16 (KERN_ATTR_VECTOR ()) * main */ - m25700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m25700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m25700_s04 (KERN_ATTR_VECTOR ()) @@ -285,7 +285,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -312,7 +312,7 @@ KERNEL_FQ void m25700_s04 (KERN_ATTR_VECTOR ()) * main */ - m25700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m25700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m25700_s08 (KERN_ATTR_VECTOR ()) @@ -323,7 +323,7 @@ KERNEL_FQ void m25700_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -350,7 +350,7 @@ KERNEL_FQ void m25700_s08 (KERN_ATTR_VECTOR ()) * main */ - m25700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m25700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m25700_s16 (KERN_ATTR_VECTOR ()) @@ -361,7 +361,7 @@ KERNEL_FQ void m25700_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -388,5 +388,5 @@ KERNEL_FQ void m25700_s16 (KERN_ATTR_VECTOR ()) * main */ - m25700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m25700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m25800-pure.cl b/OpenCL/m25800-pure.cl index c8f6940ae..73014553a 100644 --- a/OpenCL/m25800-pure.cl +++ b/OpenCL/m25800-pure.cl @@ -456,7 +456,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_init (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t ctx0; @@ -535,10 +535,10 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_init (KERN_ATTR_TMPS u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; u32 P[18]; @@ -698,7 +698,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_loop (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load @@ -751,10 +751,10 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_loop (KERN_ATTR_TMPS u32 salt_buf[4]; - salt_buf[0] = salt_bufs[SALT_POS].salt_buf[0]; - salt_buf[1] = salt_bufs[SALT_POS].salt_buf[1]; - salt_buf[2] = salt_bufs[SALT_POS].salt_buf[2]; - salt_buf[3] = salt_bufs[SALT_POS].salt_buf[3]; + salt_buf[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + salt_buf[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + salt_buf[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + salt_buf[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * main loop @@ -763,7 +763,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_loop (KERN_ATTR_TMPS u32 L0; u32 R0; - for (u32 i = 0; i < loop_cnt; i++) + for (u32 i = 0; i < LOOP_CNT; i++) { for (u32 i = 0; i < 18; i++) { @@ -901,7 +901,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_comp (KERN_ATTR_TMPS const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load diff --git a/OpenCL/m25900-pure.cl b/OpenCL/m25900-pure.cl index e15cfe357..a2f1739cd 100644 --- a/OpenCL/m25900-pure.cl +++ b/OpenCL/m25900-pure.cl @@ -108,7 +108,7 @@ KERNEL_FQ void m25900_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) const u64 gid = get_global_id(0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -132,7 +132,7 @@ KERNEL_FQ void m25900_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap(&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap(&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -188,7 +188,7 @@ KERNEL_FQ void m25900_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) { const u64 gid = get_global_id(0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -234,7 +234,7 @@ KERNEL_FQ void m25900_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -351,7 +351,7 @@ KERNEL_FQ void m25900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, blocks_t) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 key[4]; @@ -370,8 +370,8 @@ KERNEL_FQ void m25900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, blocks_t) u32 yn[4]; - const u32 digest_pos = loop_pos; - const u32 digest_cur = DIGESTS_OFFSET + digest_pos; + const u32 digest_pos = LOOP_POS; + const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos; u32 b1[4]; diff --git a/OpenCL/m26000_a0-pure.cl b/OpenCL/m26000_a0-pure.cl index c702639fc..a502c6b9a 100644 --- a/OpenCL/m26000_a0-pure.cl +++ b/OpenCL/m26000_a0-pure.cl @@ -68,7 +68,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -78,35 +78,35 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t)) u32 gs_buf[5]; - gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); + gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); u32 es_buf[5]; - es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); + es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); u32 ct_buf0[2]; - ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; + ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; u32 ct_buf1[2]; - ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -410,7 +410,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -418,10 +418,10 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -432,35 +432,35 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_RULES_ESALT (mozilla_3des_t)) u32 gs_buf[5]; - gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); + gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); u32 es_buf[5]; - es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); + es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); u32 ct_buf0[2]; - ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; + ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; u32 ct_buf1[2]; - ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m26000_a1-pure.cl b/OpenCL/m26000_a1-pure.cl index c6556965b..9998cc54b 100644 --- a/OpenCL/m26000_a1-pure.cl +++ b/OpenCL/m26000_a1-pure.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_ESALT (mozilla_3des_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -83,35 +83,35 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_ESALT (mozilla_3des_t)) u32 gs_buf[5]; - gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); + gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); u32 es_buf[5]; - es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); + es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); u32 ct_buf0[2]; - ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; + ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; u32 ct_buf1[2]; - ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; @@ -433,7 +433,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_ESALT (mozilla_3des_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -441,10 +441,10 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_ESALT (mozilla_3des_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -462,35 +462,35 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_ESALT (mozilla_3des_t)) u32 gs_buf[5]; - gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); + gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); u32 es_buf[5]; - es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); + es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); u32 ct_buf0[2]; - ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; + ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; u32 ct_buf1[2]; - ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 comb_len = combs_buf[il_pos].pw_len; diff --git a/OpenCL/m26000_a3-pure.cl b/OpenCL/m26000_a3-pure.cl index b02d4a077..43212e4f6 100644 --- a/OpenCL/m26000_a3-pure.cl +++ b/OpenCL/m26000_a3-pure.cl @@ -66,7 +66,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -83,29 +83,29 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) u32 gs_buf[5]; - gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); + gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); u32 es_buf[5]; - es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); + es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); u32 ct_buf0[2]; - ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; + ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; u32 ct_buf1[2]; - ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; /** * loop @@ -113,7 +113,7 @@ KERNEL_FQ void m26000_mxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; @@ -419,7 +419,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -427,10 +427,10 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -448,29 +448,29 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) u32 gs_buf[5]; - gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0]); - gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1]); - gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2]); - gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3]); - gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4]); + gs_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0]); + gs_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1]); + gs_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2]); + gs_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3]); + gs_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4]); u32 es_buf[5]; - es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8]); - es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9]); - es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[10]); - es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[11]); - es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[12]); + es_buf[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8]); + es_buf[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9]); + es_buf[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[10]); + es_buf[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[11]); + es_buf[4] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[12]); u32 ct_buf0[2]; - ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; + ct_buf0[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf0[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; u32 ct_buf1[2]; - ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf1[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf1[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; /** * loop @@ -478,7 +478,7 @@ KERNEL_FQ void m26000_sxx (KERN_ATTR_VECTOR_ESALT (mozilla_3des_t)) u32 w0l = w[0]; - 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 u32 w0r = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m26100-pure.cl b/OpenCL/m26100-pure.cl index aee82bea4..fe72b7973 100644 --- a/OpenCL/m26100-pure.cl +++ b/OpenCL/m26100-pure.cl @@ -86,7 +86,7 @@ KERNEL_FQ void m26100_init (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_ctx_t ctx; @@ -96,11 +96,11 @@ KERNEL_FQ void m26100_init (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes u32 gs[16] = { 0 }; - gs[0] = salt_bufs[DIGESTS_OFFSET].salt_buf[0]; - gs[1] = salt_bufs[DIGESTS_OFFSET].salt_buf[1]; - gs[2] = salt_bufs[DIGESTS_OFFSET].salt_buf[2]; - gs[3] = salt_bufs[DIGESTS_OFFSET].salt_buf[3]; - gs[4] = salt_bufs[DIGESTS_OFFSET].salt_buf[4]; + gs[0] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[0]; + gs[1] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[1]; + gs[2] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[2]; + gs[3] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[3]; + gs[4] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[4]; sha1_update_swap (&ctx, gs, 20); sha1_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len); @@ -142,14 +142,14 @@ KERNEL_FQ void m26100_init (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes u32 es[16] = { 0 }; - es[0] = salt_bufs[DIGESTS_OFFSET].salt_buf[ 8]; - es[1] = salt_bufs[DIGESTS_OFFSET].salt_buf[ 9]; - es[2] = salt_bufs[DIGESTS_OFFSET].salt_buf[10]; - es[3] = salt_bufs[DIGESTS_OFFSET].salt_buf[11]; - es[4] = salt_bufs[DIGESTS_OFFSET].salt_buf[12]; - es[5] = salt_bufs[DIGESTS_OFFSET].salt_buf[13]; - es[6] = salt_bufs[DIGESTS_OFFSET].salt_buf[14]; - es[7] = salt_bufs[DIGESTS_OFFSET].salt_buf[15]; + es[0] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[ 8]; + es[1] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[ 9]; + es[2] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[10]; + es[3] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[11]; + es[4] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[12]; + es[5] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[13]; + es[6] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[14]; + es[7] = salt_bufs[DIGESTS_OFFSET_HOST].salt_buf[15]; sha256_hmac_update_swap (&sha256_hmac_ctx, es, 32); @@ -207,7 +207,7 @@ KERNEL_FQ void m26100_loop (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -253,7 +253,7 @@ KERNEL_FQ void m26100_loop (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -366,7 +366,7 @@ KERNEL_FQ void m26100_comp (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -387,17 +387,17 @@ KERNEL_FQ void m26100_comp (KERN_ATTR_TMPS_ESALT (mozilla_aes_tmp_t, mozilla_aes u32 iv_buf[4]; - iv_buf[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv_buf[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv_buf[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv_buf[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; u32 ct_buf[4]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; - ct_buf[2] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf[3] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; + ct_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; u32 pt_buf[4]; diff --git a/OpenCL/m26200_a0-pure.cl b/OpenCL/m26200_a0-pure.cl index 46b4c79ea..644418396 100644 --- a/OpenCL/m26200_a0-pure.cl +++ b/OpenCL/m26200_a0-pure.cl @@ -44,7 +44,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -56,7 +56,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -137,7 +137,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -145,10 +145,10 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -161,7 +161,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m26200_a1-pure.cl b/OpenCL/m26200_a1-pure.cl index 8f0de7c25..c66ae5e72 100644 --- a/OpenCL/m26200_a1-pure.cl +++ b/OpenCL/m26200_a1-pure.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -61,7 +61,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -95,7 +95,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -202,7 +202,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -210,10 +210,10 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -233,7 +233,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { const u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -268,7 +268,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m26200_a3-pure.cl b/OpenCL/m26200_a3-pure.cl index 8b911e638..5307c44c7 100644 --- a/OpenCL/m26200_a3-pure.cl +++ b/OpenCL/m26200_a3-pure.cl @@ -42,7 +42,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -63,7 +63,7 @@ KERNEL_FQ void m26200_mxx (KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -146,7 +146,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -154,10 +154,10 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -179,7 +179,7 @@ KERNEL_FQ void m26200_sxx (KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); diff --git a/OpenCL/m26300_a0-pure.cl b/OpenCL/m26300_a0-pure.cl index 04a2ca3be..d8b1679c4 100644 --- a/OpenCL/m26300_a0-pure.cl +++ b/OpenCL/m26300_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -37,13 +37,13 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_RULES ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -101,7 +101,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -109,10 +109,10 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -125,13 +125,13 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_RULES ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m26300_a1-pure.cl b/OpenCL/m26300_a1-pure.cl index 95e0f3509..92825031e 100644 --- a/OpenCL/m26300_a1-pure.cl +++ b/OpenCL/m26300_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -33,7 +33,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_BASIC ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -41,7 +41,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; @@ -95,7 +95,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -103,10 +103,10 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -117,7 +117,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_BASIC ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha256_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -125,7 +125,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha256_ctx_t ctx = ctx0; diff --git a/OpenCL/m26300_a3-pure.cl b/OpenCL/m26300_a3-pure.cl index 2d8f9b149..4d6c62c4d 100644 --- a/OpenCL/m26300_a3-pure.cl +++ b/OpenCL/m26300_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -42,7 +42,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_VECTOR ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -50,7 +50,7 @@ KERNEL_FQ void m26300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -112,7 +112,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -120,10 +120,10 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -143,7 +143,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_VECTOR ()) sha256_init (&ctx0); - sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); /** * loop @@ -151,7 +151,7 @@ KERNEL_FQ void m26300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m26401_a0-optimized.cl b/OpenCL/m26401_a0-optimized.cl index 8972dde5e..5335e4570 100644 --- a/OpenCL/m26401_a0-optimized.cl +++ b/OpenCL/m26401_a0-optimized.cl @@ -73,7 +73,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -99,16 +99,16 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_RULES ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; @@ -207,7 +207,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -233,10 +233,10 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_RULES ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -244,17 +244,17 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; diff --git a/OpenCL/m26401_a1-optimized.cl b/OpenCL/m26401_a1-optimized.cl index bc62cadc7..3e036f803 100644 --- a/OpenCL/m26401_a1-optimized.cl +++ b/OpenCL/m26401_a1-optimized.cl @@ -72,7 +72,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -98,16 +98,16 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_BASIC ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 15; @@ -137,7 +137,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_BASIC ()) wordr0[2] = ix_create_combt (combs_buf, il_pos, 2); wordr0[3] = ix_create_combt (combs_buf, il_pos, 3); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -259,7 +259,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -285,10 +285,10 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_BASIC ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -296,17 +296,17 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 15; @@ -336,7 +336,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_BASIC ()) wordr0[2] = ix_create_combt (combs_buf, il_pos, 2); wordr0[3] = ix_create_combt (combs_buf, il_pos, 3); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m26401_a3-optimized.cl b/OpenCL/m26401_a3-optimized.cl index 5836d993a..35469683e 100644 --- a/OpenCL/m26401_a3-optimized.cl +++ b/OpenCL/m26401_a3-optimized.cl @@ -29,10 +29,10 @@ DECLSPEC void m26401m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop @@ -40,7 +40,7 @@ DECLSPEC void m26401m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -87,10 +87,10 @@ DECLSPEC void m26401s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -98,10 +98,10 @@ DECLSPEC void m26401s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -110,7 +110,7 @@ DECLSPEC void m26401s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -199,7 +199,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -230,7 +230,7 @@ KERNEL_FQ void m26401_m04 (KERN_ATTR_VECTOR ()) * main */ - m26401m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26401m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26401_m08 (KERN_ATTR_VECTOR ()) @@ -290,7 +290,7 @@ KERNEL_FQ void m26401_m08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -321,7 +321,7 @@ KERNEL_FQ void m26401_m08 (KERN_ATTR_VECTOR ()) * main */ - m26401m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26401m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26401_m16 (KERN_ATTR_VECTOR ()) @@ -385,7 +385,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -416,7 +416,7 @@ KERNEL_FQ void m26401_s04 (KERN_ATTR_VECTOR ()) * main */ - m26401s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26401s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26401_s08 (KERN_ATTR_VECTOR ()) @@ -476,7 +476,7 @@ KERNEL_FQ void m26401_s08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -507,7 +507,7 @@ KERNEL_FQ void m26401_s08 (KERN_ATTR_VECTOR ()) * main */ - m26401s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26401s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26401_s16 (KERN_ATTR_VECTOR ()) diff --git a/OpenCL/m26402_a0-optimized.cl b/OpenCL/m26402_a0-optimized.cl index 3222afda1..dfffdce9a 100644 --- a/OpenCL/m26402_a0-optimized.cl +++ b/OpenCL/m26402_a0-optimized.cl @@ -73,7 +73,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -99,16 +99,16 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_RULES ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; @@ -209,7 +209,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -235,10 +235,10 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_RULES ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -246,17 +246,17 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; diff --git a/OpenCL/m26402_a1-optimized.cl b/OpenCL/m26402_a1-optimized.cl index 510ce3694..c84deba29 100644 --- a/OpenCL/m26402_a1-optimized.cl +++ b/OpenCL/m26402_a1-optimized.cl @@ -72,7 +72,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -98,16 +98,16 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_BASIC ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 15; @@ -141,7 +141,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_BASIC ()) wordr1[0] = ix_create_combt (combs_buf, il_pos, 4); wordr1[1] = ix_create_combt (combs_buf, il_pos, 5); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -265,7 +265,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -291,10 +291,10 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_BASIC ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -302,17 +302,17 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 15; @@ -346,7 +346,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_BASIC ()) wordr1[0] = ix_create_combt (combs_buf, il_pos, 4); wordr1[1] = ix_create_combt (combs_buf, il_pos, 5); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m26402_a3-optimized.cl b/OpenCL/m26402_a3-optimized.cl index f6021fada..c662f8ea6 100644 --- a/OpenCL/m26402_a3-optimized.cl +++ b/OpenCL/m26402_a3-optimized.cl @@ -29,10 +29,10 @@ DECLSPEC void m26402m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop @@ -40,7 +40,7 @@ DECLSPEC void m26402m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -89,10 +89,10 @@ DECLSPEC void m26402s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -100,10 +100,10 @@ DECLSPEC void m26402s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -112,7 +112,7 @@ DECLSPEC void m26402s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -203,7 +203,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -234,7 +234,7 @@ KERNEL_FQ void m26402_m04 (KERN_ATTR_VECTOR ()) * main */ - m26402m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26402m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26402_m08 (KERN_ATTR_VECTOR ()) @@ -294,7 +294,7 @@ KERNEL_FQ void m26402_m08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -325,7 +325,7 @@ KERNEL_FQ void m26402_m08 (KERN_ATTR_VECTOR ()) * main */ - m26402m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26402m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26402_m16 (KERN_ATTR_VECTOR ()) @@ -389,7 +389,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -420,7 +420,7 @@ KERNEL_FQ void m26402_s04 (KERN_ATTR_VECTOR ()) * main */ - m26402s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26402s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26402_s08 (KERN_ATTR_VECTOR ()) @@ -480,7 +480,7 @@ KERNEL_FQ void m26402_s08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -511,7 +511,7 @@ KERNEL_FQ void m26402_s08 (KERN_ATTR_VECTOR ()) * main */ - m26402s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26402s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26402_s16 (KERN_ATTR_VECTOR ()) diff --git a/OpenCL/m26403_a0-optimized.cl b/OpenCL/m26403_a0-optimized.cl index 89e7e8f1f..bb4ef8dec 100644 --- a/OpenCL/m26403_a0-optimized.cl +++ b/OpenCL/m26403_a0-optimized.cl @@ -73,7 +73,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -99,16 +99,16 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_RULES ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; @@ -211,7 +211,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * modifier @@ -237,10 +237,10 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_RULES ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -248,17 +248,17 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; diff --git a/OpenCL/m26403_a1-optimized.cl b/OpenCL/m26403_a1-optimized.cl index 8de1b51c5..d6ac9c89e 100644 --- a/OpenCL/m26403_a1-optimized.cl +++ b/OpenCL/m26403_a1-optimized.cl @@ -72,7 +72,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -98,16 +98,16 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_BASIC ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 15; @@ -145,7 +145,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -271,7 +271,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -297,10 +297,10 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_BASIC ()) u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -308,17 +308,17 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 15; @@ -356,7 +356,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m26403_a3-optimized.cl b/OpenCL/m26403_a3-optimized.cl index dcebf804c..c7a2a23a9 100644 --- a/OpenCL/m26403_a3-optimized.cl +++ b/OpenCL/m26403_a3-optimized.cl @@ -29,10 +29,10 @@ DECLSPEC void m26403m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * loop @@ -40,7 +40,7 @@ DECLSPEC void m26403m (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -91,10 +91,10 @@ DECLSPEC void m26403s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 pt[4]; - pt[0] = salt_bufs[SALT_POS].salt_buf[0]; - pt[1] = salt_bufs[SALT_POS].salt_buf[1]; - pt[2] = salt_bufs[SALT_POS].salt_buf[2]; - pt[3] = salt_bufs[SALT_POS].salt_buf[3]; + pt[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + pt[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; + pt[2] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + pt[3] = salt_bufs[SALT_POS_HOST].salt_buf[3]; /** * digest @@ -102,10 +102,10 @@ DECLSPEC void m26403s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -114,7 +114,7 @@ DECLSPEC void m26403s (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -207,7 +207,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -238,7 +238,7 @@ KERNEL_FQ void m26403_m04 (KERN_ATTR_VECTOR ()) * main */ - m26403m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26403m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26403_m08 (KERN_ATTR_VECTOR ()) @@ -298,7 +298,7 @@ KERNEL_FQ void m26403_m08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -329,7 +329,7 @@ KERNEL_FQ void m26403_m08 (KERN_ATTR_VECTOR ()) * main */ - m26403m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26403m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26403_m16 (KERN_ATTR_VECTOR ()) @@ -389,7 +389,7 @@ KERNEL_FQ void m26403_m16 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -420,7 +420,7 @@ KERNEL_FQ void m26403_m16 (KERN_ATTR_VECTOR ()) * main */ - m26403m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26403m (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26403_s04 (KERN_ATTR_VECTOR ()) @@ -480,7 +480,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -511,7 +511,7 @@ KERNEL_FQ void m26403_s04 (KERN_ATTR_VECTOR ()) * main */ - m26403s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26403s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26403_s08 (KERN_ATTR_VECTOR ()) @@ -571,7 +571,7 @@ KERNEL_FQ void m26403_s08 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -602,7 +602,7 @@ KERNEL_FQ void m26403_s08 (KERN_ATTR_VECTOR ()) * main */ - m26403s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26403s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m26403_s16 (KERN_ATTR_VECTOR ()) @@ -662,7 +662,7 @@ KERNEL_FQ void m26403_s16 (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -693,5 +693,5 @@ KERNEL_FQ void m26403_s16 (KERN_ATTR_VECTOR ()) * main */ - m26403s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m26403s (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m26500-pure.cl b/OpenCL/m26500-pure.cl index 1efa12821..fb7f3f949 100644 --- a/OpenCL/m26500-pure.cl +++ b/OpenCL/m26500-pure.cl @@ -81,13 +81,13 @@ KERNEL_FQ void m26500_init (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx0; sha1_hmac_init_global_swap (&sha1_hmac_ctx0, pws[gid].i, pws[gid].pw_len); - sha1_hmac_update_global (&sha1_hmac_ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global (&sha1_hmac_ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); // we can reuse context intermediate buffer values for pbkdf2 @@ -206,7 +206,7 @@ KERNEL_FQ void m26500_loop (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // load stuff @@ -243,10 +243,10 @@ KERNEL_FQ void m26500_loop (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ u32 ukey[4]; - ukey[0] = esalt_bufs[DIGESTS_OFFSET].uidkey[0]; - ukey[1] = esalt_bufs[DIGESTS_OFFSET].uidkey[1]; - ukey[2] = esalt_bufs[DIGESTS_OFFSET].uidkey[2]; - ukey[3] = esalt_bufs[DIGESTS_OFFSET].uidkey[3]; + ukey[0] = esalt_bufs[DIGESTS_OFFSET_HOST].uidkey[0]; + ukey[1] = esalt_bufs[DIGESTS_OFFSET_HOST].uidkey[1]; + ukey[2] = esalt_bufs[DIGESTS_OFFSET_HOST].uidkey[2]; + ukey[3] = esalt_bufs[DIGESTS_OFFSET_HOST].uidkey[3]; u32 ks[44]; @@ -254,7 +254,7 @@ KERNEL_FQ void m26500_loop (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ // here's what counts - for (u32 i = 0, xorkey = loop_pos + 1; i < loop_cnt; i++, xorkey++) + for (u32 i = 0, xorkey = LOOP_POS + 1; i < LOOP_CNT; i++, xorkey++) { u32 in[4]; @@ -355,7 +355,7 @@ KERNEL_FQ void m26500_comp (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -378,21 +378,21 @@ KERNEL_FQ void m26500_comp (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ u32 cipher[4]; - cipher[0] = esalt_bufs[DIGESTS_OFFSET].classkey1[0]; - cipher[1] = esalt_bufs[DIGESTS_OFFSET].classkey1[1]; + cipher[0] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[0]; + cipher[1] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[1]; cipher[2] = 0; cipher[3] = 0; u32 lsb[8]; - lsb[0] = esalt_bufs[DIGESTS_OFFSET].classkey1[8]; - lsb[1] = esalt_bufs[DIGESTS_OFFSET].classkey1[9]; - lsb[2] = esalt_bufs[DIGESTS_OFFSET].classkey1[6]; - lsb[3] = esalt_bufs[DIGESTS_OFFSET].classkey1[7]; - lsb[4] = esalt_bufs[DIGESTS_OFFSET].classkey1[4]; - lsb[5] = esalt_bufs[DIGESTS_OFFSET].classkey1[5]; - lsb[6] = esalt_bufs[DIGESTS_OFFSET].classkey1[2]; - lsb[7] = esalt_bufs[DIGESTS_OFFSET].classkey1[3]; + lsb[0] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[8]; + lsb[1] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[9]; + lsb[2] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[6]; + lsb[3] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[7]; + lsb[4] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[4]; + lsb[5] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[5]; + lsb[6] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[2]; + lsb[7] = esalt_bufs[DIGESTS_OFFSET_HOST].classkey1[3]; for (int j = 5; j >= 0; j--) { @@ -447,9 +447,9 @@ KERNEL_FQ void m26500_comp (KERN_ATTR_TMPS_ESALT (iphone_passcode_tmp_t, iphone_ if ((cipher[0] == 0xa6a6a6a6) && (cipher[1] == 0xa6a6a6a6)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m26600-pure.cl b/OpenCL/m26600-pure.cl index f4b82d7a1..28d1e2186 100644 --- a/OpenCL/m26600-pure.cl +++ b/OpenCL/m26600-pure.cl @@ -89,7 +89,7 @@ KERNEL_FQ void m26600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -113,7 +113,7 @@ KERNEL_FQ void m26600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -169,7 +169,7 @@ KERNEL_FQ void m26600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -215,7 +215,7 @@ KERNEL_FQ void m26600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -310,7 +310,7 @@ KERNEL_FQ void m26600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // keys @@ -335,13 +335,13 @@ KERNEL_FQ void m26600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh // iv const u32 iv[4] = { - esalt_bufs[DIGESTS_OFFSET].iv_buf[0], - esalt_bufs[DIGESTS_OFFSET].iv_buf[1], - esalt_bufs[DIGESTS_OFFSET].iv_buf[2], - esalt_bufs[DIGESTS_OFFSET].iv_buf[3] + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2], + esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3] }; - const u32 iv_len = esalt_bufs[DIGESTS_OFFSET].iv_len; + const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len; u32 J0[4] = { 0 }; @@ -356,7 +356,7 @@ KERNEL_FQ void m26600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sh u32 aad_buf[4] = { 0 }; u32 aad_len = 0; - AES_GCM_GHASH_GLOBAL (subKey, aad_buf, aad_len, esalt_bufs[DIGESTS_OFFSET].ct_buf, esalt_bufs[DIGESTS_OFFSET].ct_len, S); + AES_GCM_GHASH_GLOBAL (subKey, aad_buf, aad_len, esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf, esalt_bufs[DIGESTS_OFFSET_HOST].ct_len, S); AES_GCM_GCTR (key, J0, S, S_len, T, s_te0, s_te1, s_te2, s_te3, s_te4); diff --git a/OpenCL/m26700-pure.cl b/OpenCL/m26700-pure.cl index 5c7718c1f..a0e179de2 100644 --- a/OpenCL/m26700-pure.cl +++ b/OpenCL/m26700-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m26700_init (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -143,7 +143,7 @@ KERNEL_FQ void m26700_loop (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 h[8]; @@ -169,7 +169,7 @@ KERNEL_FQ void m26700_loop (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) tmp[i] = tmps[gid].tmp[i]; } - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -200,7 +200,7 @@ KERNEL_FQ void m26700_loop (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) } else { - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -248,7 +248,7 @@ KERNEL_FQ void m26700_comp (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -310,7 +310,7 @@ KERNEL_FQ void m26700_comp (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) sha224_update (&ctx, w, 28); - sha224_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + sha224_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); w[ 0] = h[0]; w[ 1] = h[1]; @@ -354,7 +354,7 @@ KERNEL_FQ void m26700_comp (KERN_ATTR_TMPS_ESALT (hmac_sha224_tmp_t, snmpv3_t)) sha224_hmac_init (&hmac_ctx, w, 28); - sha224_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha224_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha224_hmac_final (&hmac_ctx); diff --git a/OpenCL/m26800-pure.cl b/OpenCL/m26800-pure.cl index 679233a38..d3f89652b 100644 --- a/OpenCL/m26800-pure.cl +++ b/OpenCL/m26800-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m26800_init (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -143,7 +143,7 @@ KERNEL_FQ void m26800_loop (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 h[8]; @@ -169,7 +169,7 @@ KERNEL_FQ void m26800_loop (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) tmp[i] = tmps[gid].tmp[i]; } - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -200,7 +200,7 @@ KERNEL_FQ void m26800_loop (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) } else { - for (int i = 0, j = loop_pos; i < loop_cnt; i += 64, j += 64) + for (int i = 0, j = LOOP_POS; i < LOOP_CNT; i += 64, j += 64) { const int idx = (j % pw_len64) / 4; // the optimization trick is to be able to do this @@ -248,7 +248,7 @@ KERNEL_FQ void m26800_comp (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -310,7 +310,7 @@ KERNEL_FQ void m26800_comp (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) sha256_update (&ctx, w, 32); - sha256_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + sha256_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); w[ 0] = h[0]; w[ 1] = h[1]; @@ -354,7 +354,7 @@ KERNEL_FQ void m26800_comp (KERN_ATTR_TMPS_ESALT (hmac_sha256_tmp_t, snmpv3_t)) sha256_hmac_init (&hmac_ctx, w, 32); - sha256_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha256_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha256_hmac_final (&hmac_ctx); diff --git a/OpenCL/m26900-pure.cl b/OpenCL/m26900-pure.cl index 3b63483fa..83a11b590 100644 --- a/OpenCL/m26900-pure.cl +++ b/OpenCL/m26900-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m26900_init (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -159,7 +159,7 @@ KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u64 h[8]; @@ -185,7 +185,7 @@ KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) tmp[i] = tmps[gid].tmp[i]; } - for (u32 i = 0, j = loop_pos; i < loop_cnt; i += 128, j += 128) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i += 128, j += 128) { const int idx = (j % pw_len128) / 4; // the optimization trick is to be able to do this @@ -236,7 +236,7 @@ KERNEL_FQ void m26900_loop (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) } else { - for (u32 i = 0, j = loop_pos; i < loop_cnt; i += 128, j += 128) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i += 128, j += 128) { const int idx = (j % pw_len128) / 4; // the optimization trick is to be able to do this @@ -304,7 +304,7 @@ KERNEL_FQ void m26900_comp (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -402,7 +402,7 @@ KERNEL_FQ void m26900_comp (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) sha384_update (&ctx, w, 48); - sha384_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + sha384_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); w[ 0] = h32_from_64_S (h[0]); w[ 1] = l32_from_64_S (h[0]); @@ -478,7 +478,7 @@ KERNEL_FQ void m26900_comp (KERN_ATTR_TMPS_ESALT (hmac_sha384_tmp_t, snmpv3_t)) sha384_hmac_init (&hmac_ctx, w, 48); - sha384_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha384_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha384_hmac_final (&hmac_ctx); diff --git a/OpenCL/m27000-pure.cl b/OpenCL/m27000-pure.cl index be211cd58..e26b5be69 100644 --- a/OpenCL/m27000-pure.cl +++ b/OpenCL/m27000-pure.cl @@ -538,7 +538,7 @@ KERNEL_FQ void m27000_init (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t)) const u64 lid = get_local_id (0); const u64 lsz = get_local_size (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * salt @@ -627,15 +627,15 @@ KERNEL_FQ void m27000_comp (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 s0 = salt_bufs[SALT_POS].salt_buf[0]; - const u32 s1 = salt_bufs[SALT_POS].salt_buf[1]; - const u32 s2 = salt_bufs[SALT_POS].salt_buf[2]; + const u32 s0 = salt_bufs[SALT_POS_HOST].salt_buf[0]; + const u32 s1 = salt_bufs[SALT_POS_HOST].salt_buf[1]; + const u32 s2 = salt_bufs[SALT_POS_HOST].salt_buf[2]; const u32 a = tmps[gid].digest_buf[0]; const u32 b = tmps[gid].digest_buf[1]; diff --git a/OpenCL/m27100-pure.cl b/OpenCL/m27100-pure.cl index d34355187..6cf942650 100644 --- a/OpenCL/m27100-pure.cl +++ b/OpenCL/m27100-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m27100_init (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t)) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -115,7 +115,7 @@ KERNEL_FQ void m27100_comp (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -145,7 +145,7 @@ KERNEL_FQ void m27100_comp (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t)) md5_hmac_init_64 (&ctx0, w0, w1, w2, w3); - md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET].userdomain_buf, esalt_bufs[DIGESTS_OFFSET].user_len + esalt_bufs[DIGESTS_OFFSET].domain_len); + md5_hmac_update_global (&ctx0, esalt_bufs[DIGESTS_OFFSET_HOST].userdomain_buf, esalt_bufs[DIGESTS_OFFSET_HOST].user_len + esalt_bufs[DIGESTS_OFFSET_HOST].domain_len); md5_hmac_final (&ctx0); @@ -170,7 +170,7 @@ KERNEL_FQ void m27100_comp (KERN_ATTR_TMPS_ESALT (netntlm_tmp_t, netntlm_t)) md5_hmac_init_64 (&ctx, w0, w1, w2, w3); - md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET].chall_buf, esalt_bufs[DIGESTS_OFFSET].srvchall_len + esalt_bufs[DIGESTS_OFFSET].clichall_len); + md5_hmac_update_global (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].chall_buf, esalt_bufs[DIGESTS_OFFSET_HOST].srvchall_len + esalt_bufs[DIGESTS_OFFSET_HOST].clichall_len); md5_hmac_final (&ctx); diff --git a/OpenCL/m27200_a0-optimized.cl b/OpenCL/m27200_a0-optimized.cl index a611b25c9..76c08feda 100644 --- a/OpenCL/m27200_a0-optimized.cl +++ b/OpenCL/m27200_a0-optimized.cl @@ -30,7 +30,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -55,20 +55,20 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4] = { 0 }; - salt_buf0[0] |= salt_bufs[SALT_POS].salt_buf[ 0] << 16; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS].salt_buf[ 1] << 16; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS].salt_buf[ 2] << 16; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS].salt_buf[ 3] << 16; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS].salt_buf[ 4] << 16; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS].salt_buf[ 5] << 16; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS].salt_buf[ 6] << 16; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS].salt_buf[ 7] << 16; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS].salt_buf[ 8] << 16; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS].salt_buf[ 9] << 16; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[ 9] >> 16 | 0x2d2d0000; + salt_buf0[0] |= salt_bufs[SALT_POS_HOST].salt_buf[ 0] << 16; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 1] << 16; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 2] << 16; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 3] << 16; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 4] << 16; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 5] << 16; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 6] << 16; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 7] << 16; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 8] << 16; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 9] << 16; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 9] >> 16 | 0x2d2d0000; salt_buf2[3] = 0; - const u32 salt_len = 44; //salt_bufs[SALT_POS].salt_len; + const u32 salt_len = 44; //salt_bufs[SALT_POS_HOST].salt_len; /** * digest @@ -76,17 +76,17 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -273,7 +273,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -298,17 +298,17 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_RULES ()) u32 salt_buf2[4]; u32 salt_buf3[4] = { 0 }; - salt_buf0[0] |= salt_bufs[SALT_POS].salt_buf[ 0] << 16; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS].salt_buf[ 1] << 16; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS].salt_buf[ 2] << 16; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS].salt_buf[ 3] << 16; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS].salt_buf[ 4] << 16; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS].salt_buf[ 5] << 16; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS].salt_buf[ 6] << 16; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS].salt_buf[ 7] << 16; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS].salt_buf[ 8] << 16; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS].salt_buf[ 9] << 16; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[ 9] >> 16 | 0x2d2d0000; + salt_buf0[0] |= salt_bufs[SALT_POS_HOST].salt_buf[ 0] << 16; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 1] << 16; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 2] << 16; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 3] << 16; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 4] << 16; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 5] << 16; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 6] << 16; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 7] << 16; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 8] << 16; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 9] << 16; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 9] >> 16 | 0x2d2d0000; salt_buf2[3] = 0; const u32 salt_len = 44; @@ -319,10 +319,10 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -335,7 +335,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m27200_a0-pure.cl b/OpenCL/m27200_a0-pure.cl index 835223cd8..91b767f3c 100644 --- a/OpenCL/m27200_a0-pure.cl +++ b/OpenCL/m27200_a0-pure.cl @@ -25,7 +25,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -44,14 +44,14 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_RULES ()) ctx0.len = 2; - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update (&ctx0, dash, 2); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -81,7 +81,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_RULES ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -91,10 +91,10 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -112,14 +112,14 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_RULES ()) ctx0.len = 2; - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update (&ctx0, dash, 2); /** * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m27200_a1-optimized.cl b/OpenCL/m27200_a1-optimized.cl index 6df369682..747ef241b 100644 --- a/OpenCL/m27200_a1-optimized.cl +++ b/OpenCL/m27200_a1-optimized.cl @@ -28,7 +28,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -53,17 +53,17 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4] = { 0 }; - salt_buf0[0] |= salt_bufs[SALT_POS].salt_buf[ 0] << 16; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS].salt_buf[ 1] << 16; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS].salt_buf[ 2] << 16; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS].salt_buf[ 3] << 16; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS].salt_buf[ 4] << 16; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS].salt_buf[ 5] << 16; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS].salt_buf[ 6] << 16; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS].salt_buf[ 7] << 16; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS].salt_buf[ 8] << 16; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS].salt_buf[ 9] << 16; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[ 9] >> 16 | 0x2d2d0000; + salt_buf0[0] |= salt_bufs[SALT_POS_HOST].salt_buf[ 0] << 16; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 1] << 16; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 2] << 16; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 3] << 16; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 4] << 16; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 5] << 16; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 6] << 16; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 7] << 16; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 8] << 16; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 9] << 16; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 9] >> 16 | 0x2d2d0000; salt_buf2[3] = 0; const u32 salt_len = 44; @@ -74,17 +74,17 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -122,7 +122,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -331,7 +331,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -356,17 +356,17 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) u32 salt_buf2[4]; u32 salt_buf3[4] = { 0 }; - salt_buf0[0] |= salt_bufs[SALT_POS].salt_buf[ 0] << 16; - salt_buf0[1] = salt_bufs[SALT_POS].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS].salt_buf[ 1] << 16; - salt_buf0[2] = salt_bufs[SALT_POS].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS].salt_buf[ 2] << 16; - salt_buf0[3] = salt_bufs[SALT_POS].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS].salt_buf[ 3] << 16; - salt_buf1[0] = salt_bufs[SALT_POS].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS].salt_buf[ 4] << 16; - salt_buf1[1] = salt_bufs[SALT_POS].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS].salt_buf[ 5] << 16; - salt_buf1[2] = salt_bufs[SALT_POS].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS].salt_buf[ 6] << 16; - salt_buf1[3] = salt_bufs[SALT_POS].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS].salt_buf[ 7] << 16; - salt_buf2[0] = salt_bufs[SALT_POS].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS].salt_buf[ 8] << 16; - salt_buf2[1] = salt_bufs[SALT_POS].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS].salt_buf[ 9] << 16; - salt_buf2[2] = salt_bufs[SALT_POS].salt_buf[ 9] >> 16 | 0x2d2d0000; + salt_buf0[0] |= salt_bufs[SALT_POS_HOST].salt_buf[ 0] << 16; + salt_buf0[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 1] << 16; + salt_buf0[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 2] << 16; + salt_buf0[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 3] << 16; + salt_buf1[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 4] << 16; + salt_buf1[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 5] << 16; + salt_buf1[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 6] << 16; + salt_buf1[3] = salt_bufs[SALT_POS_HOST].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 7] << 16; + salt_buf2[0] = salt_bufs[SALT_POS_HOST].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 8] << 16; + salt_buf2[1] = salt_bufs[SALT_POS_HOST].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 9] << 16; + salt_buf2[2] = salt_bufs[SALT_POS_HOST].salt_buf[ 9] >> 16 | 0x2d2d0000; salt_buf2[3] = 0; const u32 salt_len = 44; @@ -377,10 +377,10 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -393,7 +393,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -431,7 +431,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m27200_a1-pure.cl b/OpenCL/m27200_a1-pure.cl index 6f4568639..07347d86a 100644 --- a/OpenCL/m27200_a1-pure.cl +++ b/OpenCL/m27200_a1-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -40,7 +40,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_BASIC ()) ctx0.len = 2; - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update (&ctx0, dash, 2); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -49,7 +49,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -75,7 +75,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_BASIC ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 dash[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -85,10 +85,10 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -104,7 +104,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_BASIC ()) ctx0.len = 2; - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update (&ctx0, dash, 2); sha1_update_global_swap (&ctx0, pws[gid].i, pws[gid].pw_len); @@ -113,7 +113,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m27200_a3-optimized.cl b/OpenCL/m27200_a3-optimized.cl index 8d936fa01..b147e175f 100644 --- a/OpenCL/m27200_a3-optimized.cl +++ b/OpenCL/m27200_a3-optimized.cl @@ -106,17 +106,17 @@ DECLSPEC void m27200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4] = { 0 }; - salt_buf0[0] |= hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0] << 16); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS].salt_buf[ 1] << 16); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS].salt_buf[ 2] << 16); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS].salt_buf[ 3] << 16); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS].salt_buf[ 4] << 16); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS].salt_buf[ 5] << 16); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS].salt_buf[ 6] << 16); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS].salt_buf[ 7] << 16); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS].salt_buf[ 8] << 16); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS].salt_buf[ 9] << 16); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9] >> 16 | 0x2d2d0000); + salt_buf0[0] |= hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0] << 16); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 1] << 16); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 2] << 16); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 3] << 16); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 4] << 16); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 5] << 16); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 6] << 16); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 7] << 16); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 8] << 16); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 9] << 16); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9] >> 16 | 0x2d2d0000); salt_buf2[3] = 0; const u32 salt_len = 44; @@ -131,7 +131,7 @@ DECLSPEC void m27200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -322,10 +322,10 @@ DECLSPEC void m27200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -343,17 +343,17 @@ DECLSPEC void m27200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER u32 salt_buf2[4]; u32 salt_buf3[4] = { 0 }; - salt_buf0[0] |= hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0] << 16); - salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS].salt_buf[ 1] << 16); - salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS].salt_buf[ 2] << 16); - salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS].salt_buf[ 3] << 16); - salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS].salt_buf[ 4] << 16); - salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS].salt_buf[ 5] << 16); - salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS].salt_buf[ 6] << 16); - salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS].salt_buf[ 7] << 16); - salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS].salt_buf[ 8] << 16); - salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS].salt_buf[ 9] << 16); - salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS].salt_buf[ 9] >> 16 | 0x2d2d0000); + salt_buf0[0] |= hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0] << 16); + salt_buf0[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 0] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 1] << 16); + salt_buf0[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 1] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 2] << 16); + salt_buf0[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 2] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 3] << 16); + salt_buf1[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 3] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 4] << 16); + salt_buf1[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 4] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 5] << 16); + salt_buf1[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 5] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 6] << 16); + salt_buf1[3] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 6] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 7] << 16); + salt_buf2[0] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 7] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 8] << 16); + salt_buf2[1] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 8] >> 16 | salt_bufs[SALT_POS_HOST].salt_buf[ 9] << 16); + salt_buf2[2] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[ 9] >> 16 | 0x2d2d0000); salt_buf2[3] = 0; const u32 salt_len = 44; @@ -368,7 +368,7 @@ DECLSPEC void m27200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER const u32 w0l = w0[0]; - 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); @@ -553,7 +553,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -589,7 +589,7 @@ KERNEL_FQ void m27200_m04 (KERN_ATTR_BASIC ()) * main */ - m27200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27200_m08 (KERN_ATTR_BASIC ()) @@ -600,7 +600,7 @@ KERNEL_FQ void m27200_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -636,7 +636,7 @@ KERNEL_FQ void m27200_m08 (KERN_ATTR_BASIC ()) * main */ - m27200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27200_m16 (KERN_ATTR_BASIC ()) @@ -647,7 +647,7 @@ KERNEL_FQ void m27200_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -683,7 +683,7 @@ KERNEL_FQ void m27200_m16 (KERN_ATTR_BASIC ()) * main */ - m27200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27200m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) @@ -694,7 +694,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -730,7 +730,7 @@ KERNEL_FQ void m27200_s04 (KERN_ATTR_BASIC ()) * main */ - m27200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27200_s08 (KERN_ATTR_BASIC ()) @@ -741,7 +741,7 @@ KERNEL_FQ void m27200_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -777,7 +777,7 @@ KERNEL_FQ void m27200_s08 (KERN_ATTR_BASIC ()) * main */ - m27200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27200_s16 (KERN_ATTR_BASIC ()) @@ -788,7 +788,7 @@ KERNEL_FQ void m27200_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; @@ -824,5 +824,5 @@ KERNEL_FQ void m27200_s16 (KERN_ATTR_BASIC ()) * main */ - m27200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27200s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m27200_a3-pure.cl b/OpenCL/m27200_a3-pure.cl index fc9262f30..4c3d9e66d 100644 --- a/OpenCL/m27200_a3-pure.cl +++ b/OpenCL/m27200_a3-pure.cl @@ -23,7 +23,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32x dash_vector[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; const u32 dash_scalar[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -50,7 +50,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_VECTOR ()) ctx0.len = 2; - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update (&ctx0, dash_scalar, 2); /** @@ -59,7 +59,7 @@ KERNEL_FQ void m27200_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -94,7 +94,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_VECTOR ()) const u64 lid = get_local_id (0); const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32x dash_vector[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; const u32 dash_scalar[16] = { 0x2d2d0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -105,10 +105,10 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -133,7 +133,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_VECTOR ()) ctx0.len = 2; - sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_update_global_swap (&ctx0, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); sha1_update (&ctx0, dash_scalar, 2); /** @@ -142,7 +142,7 @@ KERNEL_FQ void m27200_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/OpenCL/m27300-pure.cl b/OpenCL/m27300-pure.cl index 308c46483..24892c382 100644 --- a/OpenCL/m27300-pure.cl +++ b/OpenCL/m27300-pure.cl @@ -62,7 +62,7 @@ KERNEL_FQ void m27300_init (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -159,7 +159,7 @@ KERNEL_FQ void m27300_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u64 h[8]; @@ -185,7 +185,7 @@ KERNEL_FQ void m27300_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) tmp[i] = tmps[gid].tmp[i]; } - for (u32 i = 0, j = loop_pos; i < loop_cnt; i += 128, j += 128) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i += 128, j += 128) { const int idx = (j % pw_len128) / 4; // the optimization trick is to be able to do this @@ -236,7 +236,7 @@ KERNEL_FQ void m27300_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) } else { - for (u32 i = 0, j = loop_pos; i < loop_cnt; i += 128, j += 128) + for (u32 i = 0, j = LOOP_POS; i < LOOP_CNT; i += 128, j += 128) { const int idx = (j % pw_len128) / 4; // the optimization trick is to be able to do this @@ -304,7 +304,7 @@ KERNEL_FQ void m27300_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w0[4]; u32 w1[4]; @@ -402,7 +402,7 @@ KERNEL_FQ void m27300_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) sha512_update (&ctx, w, 64); - sha512_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + sha512_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_buf, esalt_bufs[DIGESTS_OFFSET_HOST].engineID_len); w[ 0] = h32_from_64_S (h[0]); w[ 1] = l32_from_64_S (h[0]); @@ -478,7 +478,7 @@ KERNEL_FQ void m27300_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) sha512_hmac_init (&hmac_ctx, w, 64); - sha512_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + sha512_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len); sha512_hmac_final (&hmac_ctx); diff --git a/OpenCL/m27400-pure.cl b/OpenCL/m27400-pure.cl index 9373d2b68..ab2f455e3 100644 --- a/OpenCL/m27400-pure.cl +++ b/OpenCL/m27400-pure.cl @@ -80,7 +80,7 @@ KERNEL_FQ void m27400_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_ const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha1_hmac_ctx_t sha1_hmac_ctx; @@ -98,7 +98,7 @@ KERNEL_FQ void m27400_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_ tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, salt_bufs[SALT_POS].salt_len); + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) { @@ -148,7 +148,7 @@ KERNEL_FQ void m27400_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_ { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[5]; u32x opad[5]; @@ -182,7 +182,7 @@ KERNEL_FQ void m27400_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_ out[3] = packv (tmps, out, gid, i + 3); out[4] = packv (tmps, out, gid, i + 4); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -290,7 +290,7 @@ KERNEL_FQ void m27400_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_ #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 ukey[8]; @@ -311,19 +311,19 @@ KERNEL_FQ void m27400_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, vmware_vmx_ u32 iv_buf[4]; - iv_buf[0] = esalt_bufs[DIGESTS_OFFSET].iv_buf[0]; - iv_buf[1] = esalt_bufs[DIGESTS_OFFSET].iv_buf[1]; - iv_buf[2] = esalt_bufs[DIGESTS_OFFSET].iv_buf[2]; - iv_buf[3] = esalt_bufs[DIGESTS_OFFSET].iv_buf[3]; + iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0]; + iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1]; + iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2]; + iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]; // ct u32 ct_buf[4]; - ct_buf[0] = esalt_bufs[DIGESTS_OFFSET].ct_buf[0]; - ct_buf[1] = esalt_bufs[DIGESTS_OFFSET].ct_buf[1]; - ct_buf[2] = esalt_bufs[DIGESTS_OFFSET].ct_buf[2]; - ct_buf[3] = esalt_bufs[DIGESTS_OFFSET].ct_buf[3]; + ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0]; + ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1]; + ct_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2]; + ct_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]; // decrypt first block diff --git a/OpenCL/m27500-pure.cl b/OpenCL/m27500-pure.cl index 61e706528..4d8bbbd43 100644 --- a/OpenCL/m27500-pure.cl +++ b/OpenCL/m27500-pure.cl @@ -100,7 +100,7 @@ KERNEL_FQ void m27500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -124,7 +124,7 @@ KERNEL_FQ void m27500_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -180,7 +180,7 @@ KERNEL_FQ void m27500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -226,7 +226,7 @@ KERNEL_FQ void m27500_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -339,7 +339,7 @@ KERNEL_FQ void m27500_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -376,10 +376,10 @@ KERNEL_FQ void m27500_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) u32 in[4]; - in[0] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[0]; - in[1] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[1]; - in[2] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[2]; - in[3] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[3]; + in[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[0]; + in[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[1]; + in[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[2]; + in[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[3]; u32 out[4]; @@ -414,10 +414,10 @@ KERNEL_FQ void m27500_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) // next - in[0] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[4]; - in[1] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[5]; - in[2] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[6]; - in[3] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[7]; + in[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[4]; + in[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[5]; + in[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[6]; + in[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[7]; out[0] = in[0]; out[1] = in[1]; @@ -491,7 +491,7 @@ KERNEL_FQ void m27500_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt2_buf, esalt_bufs[DIGESTS_OFFSET].salt2_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -542,7 +542,7 @@ KERNEL_FQ void m27500_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -588,7 +588,7 @@ KERNEL_FQ void m27500_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -648,7 +648,7 @@ KERNEL_FQ void m27500_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 r0 = tmps[gid].out[0]; const u32 r1 = tmps[gid].out[1]; diff --git a/OpenCL/m27600-pure.cl b/OpenCL/m27600-pure.cl index eae55a637..f2f1af602 100644 --- a/OpenCL/m27600-pure.cl +++ b/OpenCL/m27600-pure.cl @@ -100,7 +100,7 @@ KERNEL_FQ void m27600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; @@ -124,7 +124,7 @@ KERNEL_FQ void m27600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt1_buf, esalt_bufs[DIGESTS_OFFSET].salt1_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len); for (u32 i = 0, j = 1; i < 16; i += 8, j += 1) { @@ -180,7 +180,7 @@ KERNEL_FQ void m27600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -226,7 +226,7 @@ KERNEL_FQ void m27600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -339,7 +339,7 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * aes @@ -392,10 +392,10 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) u32 in[4]; - in[0] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[0]; - in[1] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[1]; - in[2] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[2]; - in[3] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[3]; + in[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[0]; + in[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[1]; + in[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[2]; + in[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[3]; u32 out[4]; @@ -430,10 +430,10 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) // next - in[0] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[4]; - in[1] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[5]; - in[2] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[6]; - in[3] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[7]; + in[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[4]; + in[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[5]; + in[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[6]; + in[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[7]; out[0] = in[0]; out[1] = in[1]; @@ -461,10 +461,10 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) // next - in[0] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[8]; - in[1] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[9]; - in[2] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[10]; - in[3] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[11]; + in[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[8]; + in[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[9]; + in[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[10]; + in[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[11]; out[0] = in[0]; out[1] = in[1]; @@ -492,10 +492,10 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) // next - in[0] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[12]; - in[1] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[13]; - in[2] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[14]; - in[3] = esalt_bufs[DIGESTS_OFFSET].enc_pass_buf[15]; + in[0] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[12]; + in[1] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[13]; + in[2] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[14]; + in[3] = esalt_bufs[DIGESTS_OFFSET_HOST].enc_pass_buf[15]; out[0] = in[0]; out[1] = in[1]; @@ -569,7 +569,7 @@ KERNEL_FQ void m27600_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt2_buf, esalt_bufs[DIGESTS_OFFSET].salt2_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt2_buf, esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -620,7 +620,7 @@ KERNEL_FQ void m27600_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -666,7 +666,7 @@ KERNEL_FQ void m27600_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -726,7 +726,7 @@ KERNEL_FQ void m27600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, vbox_t)) { const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u32 r0 = tmps[gid].out[0]; const u32 r1 = tmps[gid].out[1]; diff --git a/OpenCL/m27700-pure.cl b/OpenCL/m27700-pure.cl index 4bcca4946..9732fabdb 100644 --- a/OpenCL/m27700-pure.cl +++ b/OpenCL/m27700-pure.cl @@ -252,7 +252,7 @@ KERNEL_FQ void m27700_init (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[128] = { 0 }; @@ -279,8 +279,8 @@ KERNEL_FQ void m27700_init (KERN_ATTR_TMPS (scrypt_tmp_t)) u32 s2[4] = { 0 }; u32 s3[4] = { 0 }; - s0[0] = salt_bufs[SALT_POS].salt_buf[0]; - s0[1] = salt_bufs[SALT_POS].salt_buf[1]; + s0[0] = salt_bufs[SALT_POS_HOST].salt_buf[0]; + s0[1] = salt_bufs[SALT_POS_HOST].salt_buf[1]; sha256_hmac_update_64 (&sha256_hmac_ctx, s0, s1, s2, s3, 8); @@ -381,7 +381,7 @@ KERNEL_FQ void m27700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // SCRYPT part, init V @@ -392,7 +392,7 @@ KERNEL_FQ void m27700_loop_prepare (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -408,7 +408,7 @@ KERNEL_FQ void m27700_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf; GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf; @@ -417,7 +417,7 @@ KERNEL_FQ void m27700_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -485,7 +485,7 @@ KERNEL_FQ void m27700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * 2nd pbkdf2, creates B @@ -606,17 +606,17 @@ KERNEL_FQ void m27700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) u32 iv[4]; - iv[0] = salt_bufs[SALT_POS].salt_buf[2]; - iv[1] = salt_bufs[SALT_POS].salt_buf[3]; - iv[2] = salt_bufs[SALT_POS].salt_buf[4]; - iv[3] = salt_bufs[SALT_POS].salt_buf[5]; + iv[0] = salt_bufs[SALT_POS_HOST].salt_buf[2]; + iv[1] = salt_bufs[SALT_POS_HOST].salt_buf[3]; + iv[2] = salt_bufs[SALT_POS_HOST].salt_buf[4]; + iv[3] = salt_bufs[SALT_POS_HOST].salt_buf[5]; u32 enc[4]; - enc[0] = salt_bufs[SALT_POS].salt_buf[6]; - enc[1] = salt_bufs[SALT_POS].salt_buf[7]; - enc[2] = salt_bufs[SALT_POS].salt_buf[8]; - enc[3] = salt_bufs[SALT_POS].salt_buf[9]; + enc[0] = salt_bufs[SALT_POS_HOST].salt_buf[6]; + enc[1] = salt_bufs[SALT_POS_HOST].salt_buf[7]; + enc[2] = salt_bufs[SALT_POS_HOST].salt_buf[8]; + enc[3] = salt_bufs[SALT_POS_HOST].salt_buf[9]; u32 dec[4]; @@ -632,9 +632,9 @@ KERNEL_FQ void m27700_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) (dec[2] == 0x10101010) && (dec[3] == 0x10101010)) { - if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET]) == 0) + if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0) { - mark_hash (plains_buf, d_return_buf, SALT_POS, digests_cnt, 0, DIGESTS_OFFSET + 0, gid, 0, 0, 0); + mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, 0, DIGESTS_OFFSET_HOST + 0, gid, 0, 0, 0); } return; diff --git a/OpenCL/m27800_a0-optimized.cl b/OpenCL/m27800_a0-optimized.cl index 97aca0314..5ed860da9 100644 --- a/OpenCL/m27800_a0-optimized.cl +++ b/OpenCL/m27800_a0-optimized.cl @@ -77,7 +77,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -97,13 +97,13 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_RULES ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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) { u32x w[16] = { 0 }; @@ -142,7 +142,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -164,7 +164,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -174,13 +174,13 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_RULES ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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) { u32x w[16] = { 0 }; diff --git a/OpenCL/m27800_a1-optimized.cl b/OpenCL/m27800_a1-optimized.cl index 69833f53f..7835afed4 100644 --- a/OpenCL/m27800_a1-optimized.cl +++ b/OpenCL/m27800_a1-optimized.cl @@ -70,7 +70,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -94,13 +94,13 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_BASIC ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -138,7 +138,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -191,7 +191,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -215,7 +215,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_BASIC ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -223,7 +223,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -233,7 +233,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -271,7 +271,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m27800_a3-optimized.cl b/OpenCL/m27800_a3-optimized.cl index 92afdc899..ec4f9e0c9 100644 --- a/OpenCL/m27800_a3-optimized.cl +++ b/OpenCL/m27800_a3-optimized.cl @@ -102,7 +102,7 @@ DECLSPEC void m27800m (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -110,7 +110,7 @@ DECLSPEC void m27800m (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -142,7 +142,7 @@ DECLSPEC void m27800s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -152,7 +152,7 @@ DECLSPEC void m27800s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) * seed */ - const u32 seed = salt_bufs[SALT_POS].salt_buf[0]; + const u32 seed = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -160,7 +160,7 @@ DECLSPEC void m27800s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) u32 w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -185,7 +185,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -212,7 +212,7 @@ KERNEL_FQ void m27800_m04 (KERN_ATTR_VECTOR ()) * main */ - m27800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27800_m08 (KERN_ATTR_VECTOR ()) @@ -223,7 +223,7 @@ KERNEL_FQ void m27800_m08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -250,7 +250,7 @@ KERNEL_FQ void m27800_m08 (KERN_ATTR_VECTOR ()) * main */ - m27800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27800_m16 (KERN_ATTR_VECTOR ()) @@ -261,7 +261,7 @@ KERNEL_FQ void m27800_m16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -288,7 +288,7 @@ KERNEL_FQ void m27800_m16 (KERN_ATTR_VECTOR ()) * main */ - m27800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27800_s04 (KERN_ATTR_VECTOR ()) @@ -299,7 +299,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -326,7 +326,7 @@ KERNEL_FQ void m27800_s04 (KERN_ATTR_VECTOR ()) * main */ - m27800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27800_s08 (KERN_ATTR_VECTOR ()) @@ -337,7 +337,7 @@ KERNEL_FQ void m27800_s08 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -364,7 +364,7 @@ KERNEL_FQ void m27800_s08 (KERN_ATTR_VECTOR ()) * main */ - m27800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27800_s16 (KERN_ATTR_VECTOR ()) @@ -375,7 +375,7 @@ KERNEL_FQ void m27800_s16 (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -402,5 +402,5 @@ KERNEL_FQ void m27800_s16 (KERN_ATTR_VECTOR ()) * main */ - m27800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m27900_a0-optimized.cl b/OpenCL/m27900_a0-optimized.cl index 7b2557475..c12f3bc34 100644 --- a/OpenCL/m27900_a0-optimized.cl +++ b/OpenCL/m27900_a0-optimized.cl @@ -149,7 +149,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -169,13 +169,13 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_RULES ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; @@ -237,7 +237,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -257,7 +257,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_RULES ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -265,7 +265,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -275,7 +275,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_RULES ()) * loop */ - 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) { u32x w0[4] = { 0 }; u32x w1[4] = { 0 }; diff --git a/OpenCL/m27900_a1-optimized.cl b/OpenCL/m27900_a1-optimized.cl index c0a2db92a..97852e7af 100644 --- a/OpenCL/m27900_a1-optimized.cl +++ b/OpenCL/m27900_a1-optimized.cl @@ -147,7 +147,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -167,13 +167,13 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -211,7 +211,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -295,7 +295,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 pw_buf0[4]; u32 pw_buf1[4]; @@ -315,7 +315,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -323,7 +323,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -333,7 +333,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) * loop */ - 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 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -371,7 +371,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m27900_a3-optimized.cl b/OpenCL/m27900_a3-optimized.cl index 7b995391f..2dd986c3b 100644 --- a/OpenCL/m27900_a3-optimized.cl +++ b/OpenCL/m27900_a3-optimized.cl @@ -146,7 +146,7 @@ DECLSPEC void m27900m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * loop @@ -154,7 +154,7 @@ DECLSPEC void m27900m (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -204,7 +204,7 @@ DECLSPEC void m27900s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) * salt */ - const u32 iv = salt_bufs[SALT_POS].salt_buf[0]; + const u32 iv = salt_bufs[SALT_POS_HOST].salt_buf[0]; /** * digest @@ -212,7 +212,7 @@ DECLSPEC void m27900s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], 0, 0, 0 @@ -224,7 +224,7 @@ DECLSPEC void m27900s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) u32 w0l = w[0]; - 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); @@ -269,7 +269,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -296,7 +296,7 @@ KERNEL_FQ void m27900_m04 (KERN_ATTR_BASIC ()) * main */ - m27900m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27900m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27900_m08 (KERN_ATTR_BASIC ()) @@ -307,7 +307,7 @@ KERNEL_FQ void m27900_m08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -334,7 +334,7 @@ KERNEL_FQ void m27900_m08 (KERN_ATTR_BASIC ()) * main */ - m27900m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27900m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27900_m16 (KERN_ATTR_BASIC ()) @@ -345,7 +345,7 @@ KERNEL_FQ void m27900_m16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -372,7 +372,7 @@ KERNEL_FQ void m27900_m16 (KERN_ATTR_BASIC ()) * main */ - m27900m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27900m (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) @@ -383,7 +383,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -410,7 +410,7 @@ KERNEL_FQ void m27900_s04 (KERN_ATTR_BASIC ()) * main */ - m27900s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27900s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27900_s08 (KERN_ATTR_BASIC ()) @@ -421,7 +421,7 @@ KERNEL_FQ void m27900_s08 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -448,7 +448,7 @@ KERNEL_FQ void m27900_s08 (KERN_ATTR_BASIC ()) * main */ - m27900s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27900s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m27900_s16 (KERN_ATTR_BASIC ()) @@ -459,7 +459,7 @@ KERNEL_FQ void m27900_s16 (KERN_ATTR_BASIC ()) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; u32 w[16]; @@ -486,5 +486,5 @@ KERNEL_FQ void m27900_s16 (KERN_ATTR_BASIC ()) * main */ - m27900s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m27900s (w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m28000_a0-optimized.cl b/OpenCL/m28000_a0-optimized.cl index ceed33ac3..41ed297d2 100644 --- a/OpenCL/m28000_a0-optimized.cl +++ b/OpenCL/m28000_a0-optimized.cl @@ -226,7 +226,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_RULES_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -250,13 +250,13 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_RULES_ESALT (crc64_t)) * salt */ - const u64 iv = esalt_bufs[DIGESTS_OFFSET].iv; + const u64 iv = esalt_bufs[DIGESTS_OFFSET_HOST].iv; /** * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; @@ -338,7 +338,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_RULES_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -362,7 +362,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_RULES_ESALT (crc64_t)) * salt */ - const u64 iv = esalt_bufs[DIGESTS_OFFSET].iv; + const u64 iv = esalt_bufs[DIGESTS_OFFSET_HOST].iv; /** * digest @@ -370,8 +370,8 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_RULES_ESALT (crc64_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -380,7 +380,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_RULES_ESALT (crc64_t)) * loop */ - 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) { u32 w0[4] = { 0 }; u32 w1[4] = { 0 }; diff --git a/OpenCL/m28000_a1-optimized.cl b/OpenCL/m28000_a1-optimized.cl index 4de6f092f..4af584bbc 100644 --- a/OpenCL/m28000_a1-optimized.cl +++ b/OpenCL/m28000_a1-optimized.cl @@ -224,7 +224,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -248,13 +248,13 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t)) * salt */ - const u64 iv = esalt_bufs[DIGESTS_OFFSET].iv; + const u64 iv = esalt_bufs[DIGESTS_OFFSET_HOST].iv; /** * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -292,7 +292,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } @@ -396,7 +396,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -420,7 +420,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) * salt */ - const u64 iv = esalt_bufs[DIGESTS_OFFSET].iv; + const u64 iv = esalt_bufs[DIGESTS_OFFSET_HOST].iv; /** * digest @@ -428,8 +428,8 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -438,7 +438,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) * loop */ - 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 u32 pw_r_len = pwlenx_create_combt (combs_buf, il_pos) & 63; @@ -476,7 +476,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) wordr1[2] = ix_create_combt (combs_buf, il_pos, 6); wordr1[3] = ix_create_combt (combs_buf, il_pos, 7); - if (combs_mode == COMBINATOR_MODE_BASE_LEFT) + if (COMBS_MODE == COMBINATOR_MODE_BASE_LEFT) { switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len); } diff --git a/OpenCL/m28000_a3-optimized.cl b/OpenCL/m28000_a3-optimized.cl index 45cfe89ad..d5bf0cb5c 100644 --- a/OpenCL/m28000_a3-optimized.cl +++ b/OpenCL/m28000_a3-optimized.cl @@ -206,7 +206,7 @@ DECLSPEC void m28000m (SHM_TYPE u64 *s_crc64jonestab, u32 *w, const u32 pw_len, * salt */ - const u64 iv = esalt_bufs[DIGESTS_OFFSET].iv; + const u64 iv = esalt_bufs[DIGESTS_OFFSET_HOST].iv; /** * loop @@ -214,7 +214,7 @@ DECLSPEC void m28000m (SHM_TYPE u64 *s_crc64jonestab, u32 *w, const u32 pw_len, u32 w0l = w[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -267,7 +267,7 @@ DECLSPEC void m28000s (SHM_TYPE u64 *s_crc64jonestab, u32 *w, const u32 pw_len, * salt */ - const u64 iv = esalt_bufs[DIGESTS_OFFSET].iv; + const u64 iv = esalt_bufs[DIGESTS_OFFSET_HOST].iv; /** * digest @@ -275,8 +275,8 @@ DECLSPEC void m28000s (SHM_TYPE u64 *s_crc64jonestab, u32 *w, const u32 pw_len, const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], 0, 0 }; @@ -287,7 +287,7 @@ DECLSPEC void m28000s (SHM_TYPE u64 *s_crc64jonestab, u32 *w, const u32 pw_len, u32 w0l = w[0]; - 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 u32 w0r = ix_create_bft (bfs_buf, il_pos); @@ -358,7 +358,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -389,7 +389,7 @@ KERNEL_FQ void m28000_m04 (KERN_ATTR_ESALT (crc64_t)) * main */ - m28000m (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m28000m (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m28000_m08 (KERN_ATTR_ESALT (crc64_t)) @@ -423,7 +423,7 @@ KERNEL_FQ void m28000_m08 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -454,7 +454,7 @@ KERNEL_FQ void m28000_m08 (KERN_ATTR_ESALT (crc64_t)) * main */ - m28000m (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m28000m (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m28000_m16 (KERN_ATTR_ESALT (crc64_t)) @@ -488,7 +488,7 @@ KERNEL_FQ void m28000_m16 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -519,7 +519,7 @@ KERNEL_FQ void m28000_m16 (KERN_ATTR_ESALT (crc64_t)) * main */ - m28000m (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m28000m (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) @@ -553,7 +553,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -584,7 +584,7 @@ KERNEL_FQ void m28000_s04 (KERN_ATTR_ESALT (crc64_t)) * main */ - m28000s (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m28000s (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m28000_s08 (KERN_ATTR_ESALT (crc64_t)) @@ -618,7 +618,7 @@ KERNEL_FQ void m28000_s08 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -649,7 +649,7 @@ KERNEL_FQ void m28000_s08 (KERN_ATTR_ESALT (crc64_t)) * main */ - m28000s (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m28000s (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } KERNEL_FQ void m28000_s16 (KERN_ATTR_ESALT (crc64_t)) @@ -683,7 +683,7 @@ KERNEL_FQ void m28000_s16 (KERN_ATTR_ESALT (crc64_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * Base @@ -714,5 +714,5 @@ KERNEL_FQ void m28000_s16 (KERN_ATTR_ESALT (crc64_t)) * main */ - m28000s (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, SALT_POS, loop_pos, loop_cnt, il_cnt, digests_cnt, DIGESTS_OFFSET, combs_mode, salt_repeat, pws_pos, gid_max); + m28000s (s_crc64jonestab, w, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param); } diff --git a/OpenCL/m28100-pure.cl b/OpenCL/m28100-pure.cl index 8cbc1ca05..8d302ec12 100644 --- a/OpenCL/m28100-pure.cl +++ b/OpenCL/m28100-pure.cl @@ -96,7 +96,7 @@ KERNEL_FQ void m28100_init (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -151,7 +151,7 @@ KERNEL_FQ void m28100_init (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6]; tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7]; - sha256_hmac_update_global (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) { @@ -207,7 +207,7 @@ KERNEL_FQ void m28100_loop (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) { const u64 gid = get_global_id (0); - if ((gid * VECT_SIZE) >= gid_max) return; + if ((gid * VECT_SIZE) >= GID_MAX) return; u32x ipad[8]; u32x opad[8]; @@ -253,7 +253,7 @@ KERNEL_FQ void m28100_loop (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) out[6] = packv (tmps, out, gid, i + 6); out[7] = packv (tmps, out, gid, i + 7); - for (u32 j = 0; j < loop_cnt; j++) + for (u32 j = 0; j < LOOP_CNT; j++) { u32x w0[4]; u32x w1[4]; @@ -317,7 +317,7 @@ KERNEL_FQ void m28100_comp (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; const u64 lid = get_local_id (0); @@ -383,11 +383,11 @@ KERNEL_FQ void m28100_comp (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) for (int i = 0; i < 32; i++) sub_digest_seed[i] = 0x36363636; - sub_digest_seed[0] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[0]; - sub_digest_seed[1] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[1]; - sub_digest_seed[2] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[2]; - sub_digest_seed[3] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[3]; - sub_digest_seed[4] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[4]; + sub_digest_seed[0] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[0]; + sub_digest_seed[1] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[1]; + sub_digest_seed[2] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[2]; + sub_digest_seed[3] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[3]; + sub_digest_seed[4] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[4]; // sub_digest @@ -396,13 +396,13 @@ KERNEL_FQ void m28100_comp (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) sha512_init (&ctx2); sha512_update (&ctx2, sub_digest_seed, 128); - sha512_update_global (&ctx2, esalt_bufs[DIGESTS_OFFSET].hmac_buf, - esalt_bufs[DIGESTS_OFFSET].hmac_len); - sha512_update_global (&ctx2, esalt_bufs[DIGESTS_OFFSET].magicv_buf, - esalt_bufs[DIGESTS_OFFSET].magicv_len); + sha512_update_global (&ctx2, esalt_bufs[DIGESTS_OFFSET_HOST].hmac_buf, + esalt_bufs[DIGESTS_OFFSET_HOST].hmac_len); + sha512_update_global (&ctx2, esalt_bufs[DIGESTS_OFFSET_HOST].magicv_buf, + esalt_bufs[DIGESTS_OFFSET_HOST].magicv_len); sha512_update (&ctx2, stage4_sha512, 64); - sha512_update_global (&ctx2, esalt_bufs[DIGESTS_OFFSET].blob_buf, - esalt_bufs[DIGESTS_OFFSET].blob_len); + sha512_update_global (&ctx2, esalt_bufs[DIGESTS_OFFSET_HOST].blob_buf, + esalt_bufs[DIGESTS_OFFSET_HOST].blob_len); sha512_final (&ctx2); @@ -431,11 +431,11 @@ KERNEL_FQ void m28100_comp (KERN_ATTR_TMPS_ESALT (winhello_tmp_t, winhello_t)) for (int i = 0; i < 32; i++) main_digest_seed[i] = 0x5c5c5c5c; - main_digest_seed[0] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[0]; - main_digest_seed[1] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[1]; - main_digest_seed[2] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[2]; - main_digest_seed[3] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[3]; - main_digest_seed[4] ^= esalt_bufs[DIGESTS_OFFSET].mk_buf_pc[4]; + main_digest_seed[0] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[0]; + main_digest_seed[1] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[1]; + main_digest_seed[2] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[2]; + main_digest_seed[3] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[3]; + main_digest_seed[4] ^= esalt_bufs[DIGESTS_OFFSET_HOST].mk_buf_pc[4]; // main_digest diff --git a/OpenCL/m28200-pure.cl b/OpenCL/m28200-pure.cl index 45fee0267..bc8686aa5 100644 --- a/OpenCL/m28200-pure.cl +++ b/OpenCL/m28200-pure.cl @@ -264,13 +264,13 @@ KERNEL_FQ void m28200_init (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t)) const u64 gid = get_global_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; sha256_hmac_ctx_t sha256_hmac_ctx; sha256_hmac_init_global_swap (&sha256_hmac_ctx, pws[gid].i, pws[gid].pw_len); - sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS].salt_buf, salt_bufs[SALT_POS].salt_len); + sha256_hmac_update_global_swap (&sha256_hmac_ctx, salt_bufs[SALT_POS_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len); for (u32 i = 0, j = 1, k = 0; i < SCRYPT_CNT; i += 8, j += 1, k += 2) { @@ -369,7 +369,7 @@ KERNEL_FQ void m28200_loop_prepare (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; // SCRYPT part, init V @@ -380,7 +380,7 @@ KERNEL_FQ void m28200_loop_prepare (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -396,7 +396,7 @@ KERNEL_FQ void m28200_loop (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t)) const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; GLOBAL_AS uint4 *d_scrypt0_buf = (GLOBAL_AS uint4 *) d_extra0_buf; GLOBAL_AS uint4 *d_scrypt1_buf = (GLOBAL_AS uint4 *) d_extra1_buf; @@ -405,7 +405,7 @@ KERNEL_FQ void m28200_loop (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t)) uint4 X[STATE_CNT4]; - const u32 P_offset = salt_repeat * STATE_CNT4; + const u32 P_offset = SALT_REPEAT * STATE_CNT4; GLOBAL_AS uint4 *P = tmps[gid].P + P_offset; @@ -473,7 +473,7 @@ KERNEL_FQ void m28200_comp (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t)) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * 2nd pbkdf2, creates B @@ -577,9 +577,9 @@ KERNEL_FQ void m28200_comp (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t)) u32 iv[4]; - iv[0] = esalt_bufs[DIGESTS_OFFSET].iv[0]; - iv[1] = esalt_bufs[DIGESTS_OFFSET].iv[1]; - iv[2] = esalt_bufs[DIGESTS_OFFSET].iv[2]; + iv[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[0]; + iv[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[1]; + iv[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv[2]; iv[3] = 0; u32 J0[4] = { 0 }; @@ -593,7 +593,7 @@ KERNEL_FQ void m28200_comp (KERN_ATTR_TMPS_ESALT (exodus_tmp_t, exodus_t)) u32 aad_buf[4] = { 0 }; u32 aad_len = 0; - AES_GCM_GHASH_GLOBAL (subKey, aad_buf, aad_len, esalt_bufs[DIGESTS_OFFSET].data, 32, S); + AES_GCM_GHASH_GLOBAL (subKey, aad_buf, aad_len, esalt_bufs[DIGESTS_OFFSET_HOST].data, 32, S); AES_GCM_GCTR (key, J0, S, S_len, T, s_te0, s_te1, s_te2, s_te3, s_te4); diff --git a/OpenCL/m28300_a0-pure.cl b/OpenCL/m28300_a0-pure.cl index 1987839c4..4db6527a4 100644 --- a/OpenCL/m28300_a0-pure.cl +++ b/OpenCL/m28300_a0-pure.cl @@ -67,19 +67,19 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } COPY_PW (pws[gid]); @@ -88,7 +88,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; @@ -215,7 +215,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_RULES ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -223,23 +223,23 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_RULES ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } COPY_PW (pws[gid]); @@ -248,7 +248,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_RULES ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { pw_t tmp = PASTE_PW; diff --git a/OpenCL/m28300_a1-pure.cl b/OpenCL/m28300_a1-pure.cl index fbd97619a..c01c77344 100644 --- a/OpenCL/m28300_a1-pure.cl +++ b/OpenCL/m28300_a1-pure.cl @@ -65,19 +65,19 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } sha1_ctx_t ctx0; @@ -90,7 +90,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; @@ -211,7 +211,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_BASIC ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -219,23 +219,23 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_BASIC ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** * base */ - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32 s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } sha1_ctx_t ctx0; @@ -248,7 +248,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_BASIC ()) * loop */ - for (u32 il_pos = 0; il_pos < il_cnt; il_pos++) + for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++) { sha1_ctx_t ctx = ctx0; diff --git a/OpenCL/m28300_a3-pure.cl b/OpenCL/m28300_a3-pure.cl index 9744716f2..cfa88118a 100644 --- a/OpenCL/m28300_a3-pure.cl +++ b/OpenCL/m28300_a3-pure.cl @@ -65,7 +65,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * base @@ -80,13 +80,13 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -95,7 +95,7 @@ KERNEL_FQ void m28300_mxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; @@ -224,7 +224,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_VECTOR ()) #endif - if (gid >= gid_max) return; + if (gid >= GID_MAX) return; /** * digest @@ -232,10 +232,10 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_VECTOR ()) const u32 search[4] = { - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R0], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R1], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R2], - digests_buf[DIGESTS_OFFSET].digest_buf[DGST_R3] + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2], + digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3] }; /** @@ -251,13 +251,13 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_VECTOR ()) w[idx] = pws[gid].i[idx]; } - const u32 salt_len = salt_bufs[SALT_POS].salt_len; + const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len; u32x s[64] = { 0 }; for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1) { - s[idx] = salt_bufs[SALT_POS].salt_buf[idx]; + s[idx] = salt_bufs[SALT_POS_HOST].salt_buf[idx]; } /** @@ -266,7 +266,7 @@ KERNEL_FQ void m28300_sxx (KERN_ATTR_VECTOR ()) u32x w0l = w[0]; - 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 = words_buf_r[il_pos / VECT_SIZE]; diff --git a/docs/changes.txt b/docs/changes.txt index 94f7ef326..a4f2e9b20 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -30,6 +30,7 @@ - Association Attack: Enable module specific pw_min and pw_max settings to avoid false positives in -a 9 attack-mode - Backend Info: Added local memory size to output +- Kernels: Refactored standard kernel declaration to use a structure holding u32/u64 attributes to reduce the number of attributes - Tuning Database: Added a warning if a module implements module_extra_tuningdb_block but the installed computing device is not found - Usage Screen: On windows console, wait for any keypress if usage_mini_print() is used - User Options: Add new module function module_hash_decode_postprocess() to override hash specific configurations from command line diff --git a/include/types.h b/include/types.h index 57a3029f9..fa3e2de6c 100644 --- a/include/types.h +++ b/include/types.h @@ -1277,6 +1277,7 @@ typedef struct hc_device_param u64 size_st_salts; u64 size_st_esalts; u64 size_tm; + u64 size_kernel_params; u64 extra_buffer_size; @@ -1394,9 +1395,6 @@ typedef struct hc_device_param void *kernel_params_utf8toutf16le[PARAMCNT]; void *kernel_params_decompress[PARAMCNT]; - u32 kernel_params_buf32[PARAMCNT]; - u64 kernel_params_buf64[PARAMCNT]; - u32 kernel_params_mp_buf32[PARAMCNT]; u64 kernel_params_mp_buf64[PARAMCNT]; @@ -1424,6 +1422,8 @@ typedef struct hc_device_param u32 kernel_params_decompress_buf32[PARAMCNT]; u64 kernel_params_decompress_buf64[PARAMCNT]; + kernel_param_t kernel_param; + // API: cuda bool is_cuda; @@ -1505,6 +1505,7 @@ typedef struct hc_device_param CUdeviceptr cuda_d_st_digests_buf; CUdeviceptr cuda_d_st_salts_buf; CUdeviceptr cuda_d_st_esalts_buf; + CUdeviceptr cuda_d_kernel_param; // API: hip @@ -1587,6 +1588,7 @@ typedef struct hc_device_param hipDeviceptr_t hip_d_st_digests_buf; hipDeviceptr_t hip_d_st_salts_buf; hipDeviceptr_t hip_d_st_esalts_buf; + hipDeviceptr_t hip_d_kernel_param; // API: opencl @@ -1673,6 +1675,7 @@ typedef struct hc_device_param cl_mem opencl_d_st_digests_buf; cl_mem opencl_d_st_salts_buf; cl_mem opencl_d_st_esalts_buf; + cl_mem opencl_d_kernel_param; } hc_device_param_t; diff --git a/src/autotune.c b/src/autotune.c index 4a61b5fa5..b5a66f75f 100644 --- a/src/autotune.c +++ b/src/autotune.c @@ -15,9 +15,9 @@ static double try_run (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_par hashconfig_t *hashconfig = hashcat_ctx->hashconfig; user_options_t *user_options = hashcat_ctx->user_options; - device_param->kernel_params_buf32[28] = 0; - device_param->kernel_params_buf32[29] = kernel_loops; // not a bug, both need to be set - device_param->kernel_params_buf32[30] = kernel_loops; // because there's two variables for inner iters for slow and fast hashes + device_param->kernel_param.loop_pos = 0; + device_param->kernel_param.loop_cnt = kernel_loops; // not a bug, both need to be set + device_param->kernel_param.il_cnt = kernel_loops; // because there's two variables for inner iters for slow and fast hashes const u32 hardware_power = ((hashconfig->opts_type & OPTS_TYPE_MP_MULTI_DISABLE) ? 1 : device_param->device_processors) * kernel_threads; diff --git a/src/backend.c b/src/backend.c index cbc81f84a..0e8c45fa5 100644 --- a/src/backend.c +++ b/src/backend.c @@ -2565,7 +2565,7 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, for (u32 salt_repeat = 0; salt_repeat <= salt_repeats; salt_repeat++) { - device_param->kernel_params_buf32[34] = salt_repeat; + device_param->kernel_param.salt_repeat = salt_repeat; if (hashconfig->opts_type & OPTS_TYPE_LOOP_PREPARE) { @@ -2584,8 +2584,8 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, loop_left = MIN (loop_left, loop_step); - device_param->kernel_params_buf32[28] = loop_pos; - device_param->kernel_params_buf32[29] = loop_left; + device_param->kernel_param.loop_pos = loop_pos; + device_param->kernel_param.loop_cnt = loop_left; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_2, pws_pos, pws_cnt, true, slow_iteration) == -1) return -1; @@ -2721,7 +2721,7 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, for (u32 salt_repeat = 0; salt_repeat <= salt_repeats; salt_repeat++) { - device_param->kernel_params_buf32[34] = salt_repeat; + device_param->kernel_param.salt_repeat = salt_repeat; if (hashconfig->opts_type & OPTS_TYPE_LOOP2_PREPARE) { @@ -2740,8 +2740,8 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, loop_left = MIN (loop_left, loop_step); - device_param->kernel_params_buf32[28] = loop_pos; - device_param->kernel_params_buf32[29] = loop_left; + device_param->kernel_param.loop_pos = loop_pos; + device_param->kernel_param.loop_cnt = loop_left; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_LOOP2, pws_pos, pws_cnt, true, slow_iteration) == -1) return -1; @@ -2780,8 +2780,8 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, for (u32 loops_pos = 0; loops_pos < loops_cnt; loops_pos++) { - device_param->kernel_params_buf32[28] = loops_pos; - device_param->kernel_params_buf32[29] = loops_cnt; + device_param->kernel_param.loop_pos = loops_pos; + device_param->kernel_param.loop_cnt = loops_cnt; const u32 deep_comp_kernel = module_ctx->module_deep_comp_kernel (hashes, salt_pos, loops_pos); @@ -3175,8 +3175,8 @@ int run_opencl_kernel_bzero (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *devi cl_kernel kernel = device_param->opencl_kernel_bzero; - if (hc_clSetKernelArg (hashcat_ctx, kernel, 0, sizeof(cl_mem), (void *) &buf) == -1) return -1; - if (hc_clSetKernelArg (hashcat_ctx, kernel, 1, sizeof(cl_ulong), (void *) &num16d) == -1) return -1; + if (hc_clSetKernelArg (hashcat_ctx, kernel, 0, sizeof (cl_mem), (void *) &buf) == -1) return -1; + if (hc_clSetKernelArg (hashcat_ctx, kernel, 1, sizeof (cl_ulong), (void *) &num16d) == -1) return -1; const size_t global_work_size[3] = { num_elements, 1, 1 }; const size_t local_work_size[3] = { kernel_threads, 1, 1 }; @@ -3296,8 +3296,8 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con kernel_threads = MIN (kernel_threads, device_param->kernel_threads); - device_param->kernel_params_buf64[35] = pws_pos; - device_param->kernel_params_buf64[36] = num; + device_param->kernel_param.pws_pos = pws_pos; + device_param->kernel_param.gid_max = num; u64 num_elements = num; @@ -3324,6 +3324,8 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con case KERN_RUN_AUX4: cuda_function = device_param->cuda_function_aux4; break; } + if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_kernel_param, &device_param->kernel_param, device_param->size_kernel_params, device_param->cuda_stream) == -1) return -1; + if (hc_cuFuncSetAttribute (hashcat_ctx, cuda_function, CU_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, dynamic_shared_mem) == -1) return -1; if (kernel_threads == 0) kernel_threads = 1; @@ -3418,6 +3420,8 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con case KERN_RUN_AUX4: hip_function = device_param->hip_function_aux4; break; } + if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_kernel_param, &device_param->kernel_param, device_param->size_kernel_params, device_param->hip_stream) == -1) return -1; + //if (hc_hipFuncSetAttribute (hashcat_ctx, hip_function, HIP_FUNC_ATTRIBUTE_MAX_DYNAMIC_SHARED_SIZE_BYTES, dynamic_shared_mem) == -1) return -1; if (kernel_threads == 0) kernel_threads = 1; @@ -3512,11 +3516,14 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con case KERN_RUN_AUX4: opencl_kernel = device_param->opencl_kernel_aux4; break; } - for (u32 i = 0; i <= 23; i++) + for (u32 i = 0; i <= 24; i++) { if (hc_clSetKernelArg (hashcat_ctx, opencl_kernel, i, sizeof (cl_mem), device_param->kernel_params[i]) == -1) return -1; } + if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_kernel_param, CL_FALSE, 0, device_param->size_kernel_params, &device_param->kernel_param, 0, NULL, NULL) == -1) return -1; + + /* for (u32 i = 24; i <= 34; i++) { if (hc_clSetKernelArg (hashcat_ctx, opencl_kernel, i, sizeof (cl_uint), device_param->kernel_params[i]) == -1) return -1; @@ -3526,6 +3533,7 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con { if (hc_clSetKernelArg (hashcat_ctx, opencl_kernel, i, sizeof (cl_ulong), device_param->kernel_params[i]) == -1) return -1; } + */ num_elements = round_up_multiple_64 (num_elements, kernel_threads); @@ -4317,9 +4325,9 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co salt_t *salt_buf = &hashes->salts_buf[salt_pos]; - device_param->kernel_params_buf32[27] = salt_pos; - device_param->kernel_params_buf32[31] = salt_buf->digests_cnt; - device_param->kernel_params_buf32[32] = salt_buf->digests_offset; + device_param->kernel_param.salt_pos_host = salt_pos; + device_param->kernel_param.digests_cnt = salt_buf->digests_cnt; + device_param->kernel_param.digests_offset_host = salt_buf->digests_offset; HCFILE *combs_fp = &device_param->combs_fp; @@ -4376,7 +4384,7 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co device_param->innerloop_pos = innerloop_pos; device_param->innerloop_left = innerloop_left; - device_param->kernel_params_buf32[30] = innerloop_left; + device_param->kernel_param.il_cnt = innerloop_left; device_param->outerloop_multi = (double) innerloop_cnt / (double) (innerloop_pos + innerloop_left); @@ -9356,13 +9364,15 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) device_param->size_salts = size_salts; device_param->size_esalts = size_esalts; - u64 size_combs = KERNEL_COMBS * sizeof (pw_t); - u64 size_bfs = KERNEL_BFS * sizeof (bf_t); - u64 size_tm = 32 * sizeof (bs_word_t); + u64 size_combs = KERNEL_COMBS * sizeof (pw_t); + u64 size_bfs = KERNEL_BFS * sizeof (bf_t); + u64 size_tm = 32 * sizeof (bs_word_t); + u64 size_kernel_params = 1 * sizeof (kernel_param_t); - device_param->size_bfs = size_bfs; - device_param->size_combs = size_combs; - device_param->size_tm = size_tm; + device_param->size_bfs = size_bfs; + device_param->size_combs = size_combs; + device_param->size_tm = size_tm; + device_param->size_kernel_params = size_kernel_params; u64 size_st_digests = 1 * hashconfig->dgst_size; u64 size_st_salts = 1 * sizeof (salt_t); @@ -10073,7 +10083,8 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) + size_root_css + size_rules + size_rules_c - + size_tm; + + size_tm + + size_kernel_params; if (size_total_fixed > device_param->device_available_mem) { @@ -10103,6 +10114,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if (hc_cuMemAlloc (hashcat_ctx, &device_param->cuda_d_extra3_buf, size_extra_buffer / 4) == -1) return -1; if (hc_cuMemAlloc (hashcat_ctx, &device_param->cuda_d_st_digests_buf, size_st_digests) == -1) return -1; if (hc_cuMemAlloc (hashcat_ctx, &device_param->cuda_d_st_salts_buf, size_st_salts) == -1) return -1; + if (hc_cuMemAlloc (hashcat_ctx, &device_param->cuda_d_kernel_param, size_kernel_params) == -1) return -1; if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_bitmap_s1_a, bitmap_ctx->bitmap_s1_a, bitmap_ctx->bitmap_size, device_param->cuda_stream) == -1) return -1; if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_bitmap_s1_b, bitmap_ctx->bitmap_s1_b, bitmap_ctx->bitmap_size, device_param->cuda_stream) == -1) return -1; @@ -10213,6 +10225,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if (hc_hipMemAlloc (hashcat_ctx, &device_param->hip_d_extra3_buf, size_extra_buffer / 4) == -1) return -1; if (hc_hipMemAlloc (hashcat_ctx, &device_param->hip_d_st_digests_buf, size_st_digests) == -1) return -1; if (hc_hipMemAlloc (hashcat_ctx, &device_param->hip_d_st_salts_buf, size_st_salts) == -1) return -1; + if (hc_hipMemAlloc (hashcat_ctx, &device_param->hip_d_kernel_param, size_kernel_params) == -1) return -1; if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_bitmap_s1_a, bitmap_ctx->bitmap_s1_a, bitmap_ctx->bitmap_size, device_param->hip_stream) == -1) return -1; if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_bitmap_s1_b, bitmap_ctx->bitmap_s1_b, bitmap_ctx->bitmap_size, device_param->hip_stream) == -1) return -1; @@ -10323,6 +10336,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if (hc_clCreateBuffer (hashcat_ctx, device_param->opencl_context, CL_MEM_READ_WRITE, size_extra_buffer / 4, NULL, &device_param->opencl_d_extra3_buf) == -1) return -1; if (hc_clCreateBuffer (hashcat_ctx, device_param->opencl_context, CL_MEM_READ_ONLY, size_st_digests, NULL, &device_param->opencl_d_st_digests_buf) == -1) return -1; if (hc_clCreateBuffer (hashcat_ctx, device_param->opencl_context, CL_MEM_READ_ONLY, size_st_salts, NULL, &device_param->opencl_d_st_salts_buf) == -1) return -1; + if (hc_clCreateBuffer (hashcat_ctx, device_param->opencl_context, CL_MEM_READ_ONLY, size_kernel_params, NULL, &device_param->opencl_d_kernel_param) == -1) return -1; if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_bitmap_s1_a, CL_FALSE, 0, bitmap_ctx->bitmap_size, bitmap_ctx->bitmap_s1_a, 0, NULL, NULL) == -1) return -1; if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_bitmap_s1_b, CL_FALSE, 0, bitmap_ctx->bitmap_size, bitmap_ctx->bitmap_s1_b, 0, NULL, NULL) == -1) return -1; @@ -10396,19 +10410,21 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) * kernel args */ - device_param->kernel_params_buf32[24] = bitmap_ctx->bitmap_mask; - device_param->kernel_params_buf32[25] = bitmap_ctx->bitmap_shift1; - device_param->kernel_params_buf32[26] = bitmap_ctx->bitmap_shift2; - device_param->kernel_params_buf32[27] = 0; // salt_pos - device_param->kernel_params_buf32[28] = 0; // loop_pos - device_param->kernel_params_buf32[29] = 0; // loop_cnt - device_param->kernel_params_buf32[30] = 0; // kernel_rules_cnt - device_param->kernel_params_buf32[31] = 0; // digests_cnt - device_param->kernel_params_buf32[32] = 0; // digests_offset - device_param->kernel_params_buf32[33] = 0; // combs_mode - device_param->kernel_params_buf32[34] = 0; // salt_repeat - device_param->kernel_params_buf64[35] = 0; // pws_pos - device_param->kernel_params_buf64[36] = 0; // gid_max + device_param->kernel_param.bitmap_mask = bitmap_ctx->bitmap_mask; + device_param->kernel_param.bitmap_shift1 = bitmap_ctx->bitmap_shift1; + device_param->kernel_param.bitmap_shift2 = bitmap_ctx->bitmap_shift2; + device_param->kernel_param.salt_pos_host = 0; + device_param->kernel_param.loop_pos = 0; + device_param->kernel_param.loop_cnt = 0; + device_param->kernel_param.il_cnt = 0; + device_param->kernel_param.digests_cnt = 0; + device_param->kernel_param.digests_offset_host = 0; + device_param->kernel_param.combs_mode = 0; + device_param->kernel_param.salt_repeat = 0; + device_param->kernel_param.combs_mode = 0; + device_param->kernel_param.salt_repeat = 0; + device_param->kernel_param.pws_pos = 0; + device_param->kernel_param.gid_max = 0; if (device_param->is_cuda == true) { @@ -10436,6 +10452,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) device_param->kernel_params[21] = &device_param->cuda_d_extra1_buf; device_param->kernel_params[22] = &device_param->cuda_d_extra2_buf; device_param->kernel_params[23] = &device_param->cuda_d_extra3_buf; + device_param->kernel_params[24] = &device_param->cuda_d_kernel_param; } if (device_param->is_hip == true) @@ -10464,6 +10481,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) device_param->kernel_params[21] = &device_param->hip_d_extra1_buf; device_param->kernel_params[22] = &device_param->hip_d_extra2_buf; device_param->kernel_params[23] = &device_param->hip_d_extra3_buf; + device_param->kernel_params[24] = &device_param->hip_d_kernel_param; } if (device_param->is_opencl == true) @@ -10492,22 +10510,9 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) device_param->kernel_params[21] = &device_param->opencl_d_extra1_buf; device_param->kernel_params[22] = &device_param->opencl_d_extra2_buf; device_param->kernel_params[23] = &device_param->opencl_d_extra3_buf; + device_param->kernel_params[24] = &device_param->opencl_d_kernel_param; } - device_param->kernel_params[24] = &device_param->kernel_params_buf32[24]; - device_param->kernel_params[25] = &device_param->kernel_params_buf32[25]; - device_param->kernel_params[26] = &device_param->kernel_params_buf32[26]; - device_param->kernel_params[27] = &device_param->kernel_params_buf32[27]; - device_param->kernel_params[28] = &device_param->kernel_params_buf32[28]; - device_param->kernel_params[29] = &device_param->kernel_params_buf32[29]; - device_param->kernel_params[30] = &device_param->kernel_params_buf32[30]; - device_param->kernel_params[31] = &device_param->kernel_params_buf32[31]; - device_param->kernel_params[32] = &device_param->kernel_params_buf32[32]; - device_param->kernel_params[33] = &device_param->kernel_params_buf32[33]; - device_param->kernel_params[34] = &device_param->kernel_params_buf32[34]; - device_param->kernel_params[35] = &device_param->kernel_params_buf64[35]; - device_param->kernel_params[36] = &device_param->kernel_params_buf64[36]; - if (user_options->slow_candidates == true) { } @@ -12794,6 +12799,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if (size_st_digests > undocumented_single_allocation_apple) memory_limit_hit = 1; if (size_st_salts > undocumented_single_allocation_apple) memory_limit_hit = 1; if (size_st_esalts > undocumented_single_allocation_apple) memory_limit_hit = 1; + if (size_kernel_params > undocumented_single_allocation_apple) memory_limit_hit = 1; } const u64 size_total @@ -12827,7 +12833,8 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) + size_tmps + size_st_digests + size_st_salts - + size_st_esalts; + + size_st_esalts + + size_kernel_params; if ((size_total + EXTRA_SPACE) > device_param->device_available_mem) memory_limit_hit = 1; @@ -13261,6 +13268,7 @@ void backend_session_destroy (hashcat_ctx_t *hashcat_ctx) if (device_param->cuda_d_st_digests_buf) hc_cuMemFree (hashcat_ctx, device_param->cuda_d_st_digests_buf); if (device_param->cuda_d_st_salts_buf) hc_cuMemFree (hashcat_ctx, device_param->cuda_d_st_salts_buf); if (device_param->cuda_d_st_esalts_buf) hc_cuMemFree (hashcat_ctx, device_param->cuda_d_st_esalts_buf); + if (device_param->cuda_d_kernel_param) hc_cuMemFree (hashcat_ctx, device_param->cuda_d_kernel_param); if (device_param->cuda_event1) hc_cuEventDestroy (hashcat_ctx, device_param->cuda_event1); if (device_param->cuda_event2) hc_cuEventDestroy (hashcat_ctx, device_param->cuda_event2); @@ -13311,6 +13319,7 @@ void backend_session_destroy (hashcat_ctx_t *hashcat_ctx) device_param->cuda_d_st_digests_buf = 0; device_param->cuda_d_st_salts_buf = 0; device_param->cuda_d_st_esalts_buf = 0; + device_param->cuda_d_kernel_param = 0; device_param->cuda_function1 = NULL; device_param->cuda_function12 = NULL; @@ -13390,6 +13399,7 @@ void backend_session_destroy (hashcat_ctx_t *hashcat_ctx) if (device_param->hip_d_st_digests_buf) hc_hipMemFree (hashcat_ctx, device_param->hip_d_st_digests_buf); if (device_param->hip_d_st_salts_buf) hc_hipMemFree (hashcat_ctx, device_param->hip_d_st_salts_buf); if (device_param->hip_d_st_esalts_buf) hc_hipMemFree (hashcat_ctx, device_param->hip_d_st_esalts_buf); + if (device_param->hip_d_kernel_param) hc_hipMemFree (hashcat_ctx, device_param->hip_d_kernel_param); if (device_param->hip_event1) hc_hipEventDestroy (hashcat_ctx, device_param->hip_event1); if (device_param->hip_event2) hc_hipEventDestroy (hashcat_ctx, device_param->hip_event2); @@ -13440,6 +13450,7 @@ void backend_session_destroy (hashcat_ctx_t *hashcat_ctx) device_param->hip_d_st_digests_buf = 0; device_param->hip_d_st_salts_buf = 0; device_param->hip_d_st_esalts_buf = 0; + device_param->hip_d_kernel_param = 0; device_param->hip_function1 = NULL; device_param->hip_function12 = NULL; @@ -13519,6 +13530,7 @@ void backend_session_destroy (hashcat_ctx_t *hashcat_ctx) if (device_param->opencl_d_st_digests_buf) hc_clReleaseMemObject (hashcat_ctx, device_param->opencl_d_st_digests_buf); if (device_param->opencl_d_st_salts_buf) hc_clReleaseMemObject (hashcat_ctx, device_param->opencl_d_st_salts_buf); if (device_param->opencl_d_st_esalts_buf) hc_clReleaseMemObject (hashcat_ctx, device_param->opencl_d_st_esalts_buf); + if (device_param->opencl_d_kernel_param) hc_clReleaseMemObject (hashcat_ctx, device_param->opencl_d_kernel_param); if (device_param->opencl_kernel1) hc_clReleaseKernel (hashcat_ctx, device_param->opencl_kernel1); if (device_param->opencl_kernel12) hc_clReleaseKernel (hashcat_ctx, device_param->opencl_kernel12); @@ -13591,6 +13603,7 @@ void backend_session_destroy (hashcat_ctx_t *hashcat_ctx) device_param->opencl_d_st_digests_buf = NULL; device_param->opencl_d_st_salts_buf = NULL; device_param->opencl_d_st_esalts_buf = NULL; + device_param->opencl_d_kernel_param = NULL; device_param->opencl_kernel1 = NULL; device_param->opencl_kernel12 = NULL; device_param->opencl_kernel2p = NULL; @@ -13710,22 +13723,7 @@ int backend_session_update_combinator (hashcat_ctx_t *hashcat_ctx) // kernel_params - device_param->kernel_params_buf32[33] = combinator_ctx->combs_mode; - - /* - if (device_param->is_opencl == true) - { - CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel1, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; - CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel2, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; - CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel3, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; - CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel4, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; - - if (hashconfig->opts_type & OPTS_TYPE_HOOK12) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel12, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; } - if (hashconfig->opts_type & OPTS_TYPE_HOOK23) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel23, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; } - if (hashconfig->opts_type & OPTS_TYPE_INIT2) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_init2, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; } - if (hashconfig->opts_type & OPTS_TYPE_LOOP2) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_loop2, 33, sizeof (cl_uint), device_param->kernel_params[33]); if (CL_rc == -1) return -1; } - } - */ + device_param->kernel_param.combs_mode = combinator_ctx->combs_mode; // kernel_params_amp diff --git a/src/modules/module_02500.c b/src/modules/module_02500.c index 69b6a3e29..2bb89a3c8 100644 --- a/src/modules/module_02500.c +++ b/src/modules/module_02500.c @@ -543,6 +543,24 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M return false; } + kernel_param_t kernel_param; + + kernel_param.bitmap_mask = 0; + kernel_param.bitmap_shift1 = 0; + kernel_param.bitmap_shift2 = 0; + kernel_param.salt_pos_host = 0; + kernel_param.loop_pos = 0; + kernel_param.loop_cnt = 0; + kernel_param.il_cnt = 0; + kernel_param.digests_cnt = 1; + kernel_param.digests_offset_host = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.pws_pos = 0; + kernel_param.gid_max = 1; + m02500_aux ( NULL, // pws @@ -569,19 +587,7 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M NULL, // d_extra1_buf NULL, // d_extra2_buf NULL, // d_extra3_buf - 0, // bitmap_mask - 0, // bitmap_shift1 - 0, // bitmap_shift2 - 0, // salt_pos - 0, // loop_pos - 0, // loop_cnt - 0, // il_cnt - 1, // digests_cnt - 0, // digests_offset - 0, // combs_mode - 0, // salt_repeat - 0, // pws_pos - 1 // gid_max + &kernel_param // kernel_param ); const bool r = (d_return_buf == 0) ? false : true; diff --git a/src/modules/module_02501.c b/src/modules/module_02501.c index 54875309d..873802cc8 100644 --- a/src/modules/module_02501.c +++ b/src/modules/module_02501.c @@ -518,6 +518,24 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M return false; } + kernel_param_t kernel_param; + + kernel_param.bitmap_mask = 0; + kernel_param.bitmap_shift1 = 0; + kernel_param.bitmap_shift2 = 0; + kernel_param.salt_pos_host = 0; + kernel_param.loop_pos = 0; + kernel_param.loop_cnt = 0; + kernel_param.il_cnt = 0; + kernel_param.digests_cnt = 1; + kernel_param.digests_offset_host = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.pws_pos = 0; + kernel_param.gid_max = 1; + m02501_aux ( NULL, // pws @@ -544,19 +562,7 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M NULL, // d_extra1_buf NULL, // d_extra2_buf NULL, // d_extra3_buf - 0, // bitmap_mask - 0, // bitmap_shift1 - 0, // bitmap_shift2 - 0, // salt_pos - 0, // loop_pos - 0, // loop_cnt - 0, // il_cnt - 1, // digests_cnt - 0, // digests_offset - 0, // combs_mode - 0, // salt_repeat - 0, // pws_pos - 1 // gid_max + &kernel_param // kernel_param ); const bool r = (d_return_buf == 0) ? false : true; diff --git a/src/modules/module_16800.c b/src/modules/module_16800.c index 376260dba..b880d15e9 100644 --- a/src/modules/module_16800.c +++ b/src/modules/module_16800.c @@ -254,6 +254,24 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M m16800_aux = m16800_aux1; + kernel_param_t kernel_param; + + kernel_param.bitmap_mask = 0; + kernel_param.bitmap_shift1 = 0; + kernel_param.bitmap_shift2 = 0; + kernel_param.salt_pos_host = 0; + kernel_param.loop_pos = 0; + kernel_param.loop_cnt = 0; + kernel_param.il_cnt = 0; + kernel_param.digests_cnt = 1; + kernel_param.digests_offset_host = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.pws_pos = 0; + kernel_param.gid_max = 1; + m16800_aux ( NULL, // pws @@ -280,19 +298,7 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M NULL, // d_extra1_buf NULL, // d_extra2_buf NULL, // d_extra3_buf - 0, // bitmap_mask - 0, // bitmap_shift1 - 0, // bitmap_shift2 - 0, // salt_pos - 0, // loop_pos - 0, // loop_cnt - 0, // il_cnt - 1, // digests_cnt - 0, // digests_offset - 0, // combs_mode - 0, // salt_repeat - 0, // pws_pos - 1 // gid_max + &kernel_param // kernel_param ); const bool r = (d_return_buf == 0) ? false : true; diff --git a/src/modules/module_16801.c b/src/modules/module_16801.c index 86bdcd707..b860ca1f4 100644 --- a/src/modules/module_16801.c +++ b/src/modules/module_16801.c @@ -276,6 +276,24 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M m16801_aux = m16801_aux1; + kernel_param_t kernel_param; + + kernel_param.bitmap_mask = 0; + kernel_param.bitmap_shift1 = 0; + kernel_param.bitmap_shift2 = 0; + kernel_param.salt_pos_host = 0; + kernel_param.loop_pos = 0; + kernel_param.loop_cnt = 0; + kernel_param.il_cnt = 0; + kernel_param.digests_cnt = 1; + kernel_param.digests_offset_host = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.pws_pos = 0; + kernel_param.gid_max = 1; + m16801_aux ( NULL, // pws @@ -302,19 +320,7 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M NULL, // d_extra1_buf NULL, // d_extra2_buf NULL, // d_extra3_buf - 0, // bitmap_mask - 0, // bitmap_shift1 - 0, // bitmap_shift2 - 0, // salt_pos - 0, // loop_pos - 0, // loop_cnt - 0, // il_cnt - 1, // digests_cnt - 0, // digests_offset - 0, // combs_mode - 0, // salt_repeat - 0, // pws_pos - 1 // gid_max + &kernel_param // kernel_param ); const bool r = (d_return_buf == 0) ? false : true; diff --git a/src/modules/module_22000.c b/src/modules/module_22000.c index 68f834576..650391cdd 100644 --- a/src/modules/module_22000.c +++ b/src/modules/module_22000.c @@ -568,6 +568,24 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M return false; } + kernel_param_t kernel_param; + + kernel_param.bitmap_mask = 0; + kernel_param.bitmap_shift1 = 0; + kernel_param.bitmap_shift2 = 0; + kernel_param.salt_pos_host = 0; + kernel_param.loop_pos = 0; + kernel_param.loop_cnt = 0; + kernel_param.il_cnt = 0; + kernel_param.digests_cnt = 1; + kernel_param.digests_offset_host = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.pws_pos = 0; + kernel_param.gid_max = 1; + m22000_aux ( NULL, // pws @@ -594,19 +612,7 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M NULL, // d_extra1_buf NULL, // d_extra2_buf NULL, // d_extra3_buf - 0, // bitmap_mask - 0, // bitmap_shift1 - 0, // bitmap_shift2 - 0, // salt_pos - 0, // loop_pos - 0, // loop_cnt - 0, // il_cnt - 1, // digests_cnt - 0, // digests_offset - 0, // combs_mode - 0, // salt_repeat - 0, // pws_pos - 1 // gid_max + &kernel_param // kernel_param ); const bool r = (d_return_buf == 0) ? false : true; diff --git a/src/modules/module_22001.c b/src/modules/module_22001.c index 7decf0cf6..8c67e515c 100644 --- a/src/modules/module_22001.c +++ b/src/modules/module_22001.c @@ -569,6 +569,24 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M return false; } + kernel_param_t kernel_param; + + kernel_param.bitmap_mask = 0; + kernel_param.bitmap_shift1 = 0; + kernel_param.bitmap_shift2 = 0; + kernel_param.salt_pos_host = 0; + kernel_param.loop_pos = 0; + kernel_param.loop_cnt = 0; + kernel_param.il_cnt = 0; + kernel_param.digests_cnt = 1; + kernel_param.digests_offset_host = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.combs_mode = 0; + kernel_param.salt_repeat = 0; + kernel_param.pws_pos = 0; + kernel_param.gid_max = 1; + m22001_aux ( NULL, // pws @@ -595,19 +613,7 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M NULL, // d_extra1_buf NULL, // d_extra2_buf NULL, // d_extra3_buf - 0, // bitmap_mask - 0, // bitmap_shift1 - 0, // bitmap_shift2 - 0, // salt_pos - 0, // loop_pos - 0, // loop_cnt - 0, // il_cnt - 1, // digests_cnt - 0, // digests_offset - 0, // combs_mode - 0, // salt_repeat - 0, // pws_pos - 1 // gid_max + &kernel_param // kernel_param ); const bool r = (d_return_buf == 0) ? false : true; diff --git a/src/selftest.c b/src/selftest.c index 302705b48..5379650aa 100644 --- a/src/selftest.c +++ b/src/selftest.c @@ -46,8 +46,8 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param device_param->kernel_params[18] = &device_param->opencl_d_st_esalts_buf; } - device_param->kernel_params_buf32[31] = 1; - device_param->kernel_params_buf32[32] = 0; + device_param->kernel_param.digests_cnt = 1; + device_param->kernel_param.digests_offset_host = 0; // password : move the known password into a fake buffer @@ -82,7 +82,7 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param { if (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) { - device_param->kernel_params_buf32[30] = 1; + device_param->kernel_param.il_cnt = 1; } memset (&pw, 0, sizeof (pw)); @@ -116,7 +116,7 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param { if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) { - device_param->kernel_params_buf32[30] = 1; + device_param->kernel_param.il_cnt = 1; memset (&pw, 0, sizeof (pw)); @@ -150,8 +150,8 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param } else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) { - device_param->kernel_params_buf32[30] = 1; - device_param->kernel_params_buf32[33] = COMBINATOR_MODE_BASE_LEFT; + device_param->kernel_param.il_cnt = 1; + device_param->kernel_param.combs_mode = COMBINATOR_MODE_BASE_LEFT; memset (&pw, 0, sizeof (pw)); @@ -219,7 +219,7 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param } else if (user_options_extra->attack_kern == ATTACK_KERN_BF) { - device_param->kernel_params_buf32[30] = 1; + device_param->kernel_param.il_cnt = 1; if (hashconfig->opts_type & OPTS_TYPE_TM_KERNEL) { @@ -547,7 +547,7 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param for (u32 salt_repeat = 0; salt_repeat <= salt_repeats; salt_repeat++) { - device_param->kernel_params_buf32[34] = salt_repeat; + device_param->kernel_param.salt_repeat = salt_repeat; if (hashconfig->opts_type & OPTS_TYPE_LOOP_PREPARE) { @@ -562,8 +562,8 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param loop_left = MIN (loop_left, loop_step); - device_param->kernel_params_buf32[28] = loop_pos; - device_param->kernel_params_buf32[29] = loop_left; + device_param->kernel_param.loop_pos = loop_pos; + device_param->kernel_param.loop_cnt = loop_left; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_2, 0, 1, false, 0) == -1) return -1; @@ -623,7 +623,7 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param for (u32 salt_repeat = 0; salt_repeat <= salt_repeats; salt_repeat++) { - device_param->kernel_params_buf32[34] = salt_repeat; + device_param->kernel_param.salt_repeat = salt_repeat; if (hashconfig->opts_type & OPTS_TYPE_LOOP2_PREPARE) { @@ -640,8 +640,8 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param loop_left = MIN (loop_left, loop_step); - device_param->kernel_params_buf32[28] = loop_pos; - device_param->kernel_params_buf32[29] = loop_left; + device_param->kernel_param.loop_pos = loop_pos; + device_param->kernel_param.loop_cnt = loop_left; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_LOOP2, 0, 1, false, 0) == -1) return -1; } @@ -650,8 +650,8 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param if (hashconfig->opts_type & OPTS_TYPE_DEEP_COMP_KERNEL) { - device_param->kernel_params_buf32[28] = 0; - device_param->kernel_params_buf32[29] = 1; + device_param->kernel_param.loop_pos = 0; + device_param->kernel_param.loop_cnt = 1; if (hashconfig->opts_type & OPTS_TYPE_AUX1) { @@ -710,13 +710,14 @@ static int selftest (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param // finish : cleanup and restore - device_param->kernel_params_buf32[28] = 0; - device_param->kernel_params_buf32[29] = 0; - device_param->kernel_params_buf32[30] = 0; - device_param->kernel_params_buf32[31] = 0; - device_param->kernel_params_buf32[32] = 0; - device_param->kernel_params_buf32[33] = 0; - device_param->kernel_params_buf32[34] = 0; + // ??? bug because not set ??? device_param->kernel_param.salt_pos_host = 0; + device_param->kernel_param.loop_pos = 0; + device_param->kernel_param.loop_cnt = 0; + device_param->kernel_param.il_cnt = 0; + device_param->kernel_param.digests_cnt = 0; + device_param->kernel_param.digests_offset_host = 0; + device_param->kernel_param.combs_mode = 0; + device_param->kernel_param.salt_repeat = 0; if (device_param->is_cuda == true) { diff --git a/src/status.c b/src/status.c index 921c9be55..8bf13d4b3 100644 --- a/src/status.c +++ b/src/status.c @@ -1752,7 +1752,7 @@ int status_get_salt_pos_dev (const hashcat_ctx_t *hashcat_ctx, const int backend if ((device_param->skipped == false) && (device_param->skipped_warning == false)) { - salt_pos = (int) device_param->kernel_params_buf32[27]; + salt_pos = (int) device_param->kernel_param.salt_pos_host; } return salt_pos; @@ -1800,7 +1800,7 @@ int status_get_iteration_pos_dev (const hashcat_ctx_t *hashcat_ctx, const int ba if ((device_param->skipped == false) && (device_param->skipped_warning == false)) { - iteration_pos = (int) device_param->kernel_params_buf32[28]; + iteration_pos = (int) device_param->kernel_param.loop_pos; } return iteration_pos; @@ -1816,7 +1816,7 @@ int status_get_iteration_left_dev (const hashcat_ctx_t *hashcat_ctx, const int b if ((device_param->skipped == false) && (device_param->skipped_warning == false)) { - iteration_left = (int) device_param->kernel_params_buf32[29]; + iteration_left = (int) device_param->kernel_param.loop_cnt; } return iteration_left; diff --git a/src/stdout.c b/src/stdout.c index 1d52881cd..343009a3b 100644 --- a/src/stdout.c +++ b/src/stdout.c @@ -102,7 +102,7 @@ int process_stdout (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, u32 plain_len = 0; - const u32 il_cnt = device_param->kernel_params_buf32[30]; // ugly, i know + const u32 il_cnt = device_param->kernel_param.il_cnt; // ugly, i know if ((user_options->attack_mode == ATTACK_MODE_STRAIGHT) || (user_options->attack_mode == ATTACK_MODE_ASSOCIATION)) {