From c1d15d613b833c3134a5b52cf7a92bbdde374a7b Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Mon, 29 Jul 2019 17:16:53 +0200 Subject: [PATCH] switch hash-mode from 19400 to 20700 --- ...a0-optimized.cl => m20700_a0-optimized.cl} | 12 ++++---- .../{m19400_a0-pure.cl => m20700_a0-pure.cl} | 4 +-- ...a1-optimized.cl => m20700_a1-optimized.cl} | 12 ++++---- .../{m19400_a1-pure.cl => m20700_a1-pure.cl} | 4 +-- ...a3-optimized.cl => m20700_a3-optimized.cl} | 28 +++++++++---------- .../{m19400_a3-pure.cl => m20700_a3-pure.cl} | 4 +-- .../{module_19400.c => module_20700.c} | 2 +- tools/test_modules/{m19400.pm => m20700.pm} | 0 8 files changed, 33 insertions(+), 33 deletions(-) rename OpenCL/{m19400_a0-optimized.cl => m20700_a0-optimized.cl} (99%) rename OpenCL/{m19400_a0-pure.cl => m20700_a0-pure.cl} (98%) rename OpenCL/{m19400_a1-optimized.cl => m20700_a1-optimized.cl} (99%) rename OpenCL/{m19400_a1-pure.cl => m20700_a1-pure.cl} (98%) rename OpenCL/{m19400_a3-optimized.cl => m20700_a3-optimized.cl} (98%) rename OpenCL/{m19400_a3-pure.cl => m20700_a3-pure.cl} (98%) rename src/modules/{module_19400.c => module_20700.c} (99%) rename tools/test_modules/{m19400.pm => m20700.pm} (100%) diff --git a/OpenCL/m19400_a0-optimized.cl b/OpenCL/m20700_a0-optimized.cl similarity index 99% rename from OpenCL/m19400_a0-optimized.cl rename to OpenCL/m20700_a0-optimized.cl index de343f7fa..c4d263fb2 100644 --- a/OpenCL/m19400_a0-optimized.cl +++ b/OpenCL/m20700_a0-optimized.cl @@ -42,7 +42,7 @@ h = 0; \ } -KERNEL_FQ void m19400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -493,15 +493,15 @@ KERNEL_FQ void m19400_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m19400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m19400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m19400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -961,10 +961,10 @@ KERNEL_FQ void m19400_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m19400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m19400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m19400_a0-pure.cl b/OpenCL/m20700_a0-pure.cl similarity index 98% rename from OpenCL/m19400_a0-pure.cl rename to OpenCL/m20700_a0-pure.cl index f35929826..f3f6d6308 100644 --- a/OpenCL/m19400_a0-pure.cl +++ b/OpenCL/m20700_a0-pure.cl @@ -28,7 +28,7 @@ #define uint_to_hex_lower8_le(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #endif -KERNEL_FQ void m19400_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -140,7 +140,7 @@ KERNEL_FQ void m19400_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m19400_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m20700_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m19400_a1-optimized.cl b/OpenCL/m20700_a1-optimized.cl similarity index 99% rename from OpenCL/m19400_a1-optimized.cl rename to OpenCL/m20700_a1-optimized.cl index 679d8479f..447e6cd36 100644 --- a/OpenCL/m19400_a1-optimized.cl +++ b/OpenCL/m20700_a1-optimized.cl @@ -40,7 +40,7 @@ h = 0; \ } -KERNEL_FQ void m19400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -549,15 +549,15 @@ KERNEL_FQ void m19400_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m19400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m19400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m19400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -1075,10 +1075,10 @@ KERNEL_FQ void m19400_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m19400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m19400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m19400_a1-pure.cl b/OpenCL/m20700_a1-pure.cl similarity index 98% rename from OpenCL/m19400_a1-pure.cl rename to OpenCL/m20700_a1-pure.cl index 9b4a2b346..fd8a312ad 100644 --- a/OpenCL/m19400_a1-pure.cl +++ b/OpenCL/m20700_a1-pure.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #endif -KERNEL_FQ void m19400_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -136,7 +136,7 @@ KERNEL_FQ void m19400_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m19400_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20700_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m19400_a3-optimized.cl b/OpenCL/m20700_a3-optimized.cl similarity index 98% rename from OpenCL/m19400_a3-optimized.cl rename to OpenCL/m20700_a3-optimized.cl index e6892950b..a08dce4c4 100644 --- a/OpenCL/m19400_a3-optimized.cl +++ b/OpenCL/m20700_a3-optimized.cl @@ -40,7 +40,7 @@ h = 0; \ } -DECLSPEC void m19400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc) +DECLSPEC void m20700m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -450,7 +450,7 @@ DECLSPEC void m19400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u } } -DECLSPEC void m19400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc) +DECLSPEC void m20700s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -875,7 +875,7 @@ DECLSPEC void m19400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u } } -KERNEL_FQ void m19400_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -933,10 +933,10 @@ KERNEL_FQ void m19400_m04 (KERN_ATTR_VECTOR ()) * main */ - m19400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); + m20700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -KERNEL_FQ void m19400_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -994,10 +994,10 @@ KERNEL_FQ void m19400_m08 (KERN_ATTR_VECTOR ()) * main */ - m19400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); + m20700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -KERNEL_FQ void m19400_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -1055,10 +1055,10 @@ KERNEL_FQ void m19400_m16 (KERN_ATTR_VECTOR ()) * main */ - m19400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); + m20700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -KERNEL_FQ void m19400_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -1116,10 +1116,10 @@ KERNEL_FQ void m19400_s04 (KERN_ATTR_VECTOR ()) * main */ - m19400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); + m20700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -KERNEL_FQ void m19400_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -1177,10 +1177,10 @@ KERNEL_FQ void m19400_s08 (KERN_ATTR_VECTOR ()) * main */ - m19400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); + m20700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -KERNEL_FQ void m19400_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -1238,5 +1238,5 @@ KERNEL_FQ void m19400_s16 (KERN_ATTR_VECTOR ()) * main */ - m19400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); + m20700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } diff --git a/OpenCL/m19400_a3-pure.cl b/OpenCL/m20700_a3-pure.cl similarity index 98% rename from OpenCL/m19400_a3-pure.cl rename to OpenCL/m20700_a3-pure.cl index 7798664b6..09155b33d 100644 --- a/OpenCL/m19400_a3-pure.cl +++ b/OpenCL/m20700_a3-pure.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf]) #endif -KERNEL_FQ void m19400_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -149,7 +149,7 @@ KERNEL_FQ void m19400_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m19400_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20700_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/src/modules/module_19400.c b/src/modules/module_20700.c similarity index 99% rename from src/modules/module_19400.c rename to src/modules/module_20700.c index 35adb27b2..7473c661c 100644 --- a/src/modules/module_19400.c +++ b/src/modules/module_20700.c @@ -19,7 +19,7 @@ static const u32 DGST_POS3 = 6; static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED; static const char *HASH_NAME = "AuthMe - sha256(sha256($pass).$salt)"; -static const u64 KERN_TYPE = 19400; +static const u64 KERN_TYPE = 20700; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP diff --git a/tools/test_modules/m19400.pm b/tools/test_modules/m20700.pm similarity index 100% rename from tools/test_modules/m19400.pm rename to tools/test_modules/m20700.pm