From 04a87d73c24af939f9e126efa8a45f0f7bc86655 Mon Sep 17 00:00:00 2001 From: cfreal Date: Sat, 5 Sep 2020 20:11:09 +0200 Subject: [PATCH] Changed mode from 4720 to 4510 --- ...a0-optimized.cl => m04510_a0-optimized.cl} | 12 ++++---- .../{m04720_a0-pure.cl => m04510_a0-pure.cl} | 4 +-- ...a1-optimized.cl => m04510_a1-optimized.cl} | 2 +- .../{m04720_a1-pure.cl => m04510_a1-pure.cl} | 4 +-- ...a3-optimized.cl => m04510_a3-optimized.cl} | 28 +++++++++---------- .../{m04720_a3-pure.cl => m04510_a3-pure.cl} | 2 +- .../{module_04720.c => module_04510.c} | 2 +- tools/test_modules/{m04720.pm => m04510.pm} | 0 8 files changed, 27 insertions(+), 27 deletions(-) rename OpenCL/{m04720_a0-optimized.cl => m04510_a0-optimized.cl} (99%) rename OpenCL/{m04720_a0-pure.cl => m04510_a0-pure.cl} (98%) rename OpenCL/{m04720_a1-optimized.cl => m04510_a1-optimized.cl} (99%) rename OpenCL/{m04720_a1-pure.cl => m04510_a1-pure.cl} (98%) rename OpenCL/{m04720_a3-optimized.cl => m04510_a3-optimized.cl} (99%) rename OpenCL/{m04720_a3-pure.cl => m04510_a3-pure.cl} (99%) rename src/modules/{module_04720.c => module_04510.c} (99%) rename tools/test_modules/{m04720.pm => m04510.pm} (100%) diff --git a/OpenCL/m04720_a0-optimized.cl b/OpenCL/m04510_a0-optimized.cl similarity index 99% rename from OpenCL/m04720_a0-optimized.cl rename to OpenCL/m04510_a0-optimized.cl index b116ba222..fa94db9a7 100644 --- a/OpenCL/m04720_a0-optimized.cl +++ b/OpenCL/m04510_a0-optimized.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 m04720_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -1019,15 +1019,15 @@ KERNEL_FQ void m04720_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04720_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m04720_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m04720_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -2041,10 +2041,10 @@ KERNEL_FQ void m04720_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04720_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m04720_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04720_a0-pure.cl b/OpenCL/m04510_a0-pure.cl similarity index 98% rename from OpenCL/m04720_a0-pure.cl rename to OpenCL/m04510_a0-pure.cl index 8081ea00f..2416f3b06 100644 --- a/OpenCL/m04720_a0-pure.cl +++ b/OpenCL/m04510_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 m04720_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04510_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -131,7 +131,7 @@ KERNEL_FQ void m04720_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m04720_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04510_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m04720_a1-optimized.cl b/OpenCL/m04510_a1-optimized.cl similarity index 99% rename from OpenCL/m04720_a1-optimized.cl rename to OpenCL/m04510_a1-optimized.cl index 8e14cdf0a..99fedd4b7 100644 --- a/OpenCL/m04720_a1-optimized.cl +++ b/OpenCL/m04510_a1-optimized.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 m04720_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04720_a1-pure.cl b/OpenCL/m04510_a1-pure.cl similarity index 98% rename from OpenCL/m04720_a1-pure.cl rename to OpenCL/m04510_a1-pure.cl index a027990eb..a27486518 100644 --- a/OpenCL/m04720_a1-pure.cl +++ b/OpenCL/m04510_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 m04720_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -127,7 +127,7 @@ KERNEL_FQ void m04720_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m04720_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04720_a3-optimized.cl b/OpenCL/m04510_a3-optimized.cl similarity index 99% rename from OpenCL/m04720_a3-optimized.cl rename to OpenCL/m04510_a3-optimized.cl index 8ca4695a9..34a2428c5 100644 --- a/OpenCL/m04720_a3-optimized.cl +++ b/OpenCL/m04510_a3-optimized.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 -DECLSPEC void m04720m (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 * l_bin2asc) +DECLSPEC void m04510m (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 * l_bin2asc) { /** * modifier @@ -976,7 +976,7 @@ DECLSPEC void m04720m (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, } } -DECLSPEC void m04720s (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 * l_bin2asc) +DECLSPEC void m04510s (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 * l_bin2asc) { /** * modifier @@ -1949,7 +1949,7 @@ DECLSPEC void m04720s (u32 * w0, u32 * w1, u32 * w2, u32 * w3, const u32 pw_len, } } -KERNEL_FQ void m04720_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -2016,10 +2016,10 @@ KERNEL_FQ void m04720_m04 (KERN_ATTR_BASIC ()) * main */ - m04720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_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); + 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, gid_max, l_bin2asc); } -KERNEL_FQ void m04720_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -2086,10 +2086,10 @@ KERNEL_FQ void m04720_m08 (KERN_ATTR_BASIC ()) * main */ - m04720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_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); + 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, gid_max, l_bin2asc); } -KERNEL_FQ void m04720_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -2156,10 +2156,10 @@ KERNEL_FQ void m04720_m16 (KERN_ATTR_BASIC ()) * main */ - m04720m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_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); + 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, gid_max, l_bin2asc); } -KERNEL_FQ void m04720_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -2226,10 +2226,10 @@ KERNEL_FQ void m04720_s04 (KERN_ATTR_BASIC ()) * main */ - m04720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_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); + 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, gid_max, l_bin2asc); } -KERNEL_FQ void m04720_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -2296,10 +2296,10 @@ KERNEL_FQ void m04720_s08 (KERN_ATTR_BASIC ()) * main */ - m04720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_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); + 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, gid_max, l_bin2asc); } -KERNEL_FQ void m04720_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04510_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -2366,5 +2366,5 @@ KERNEL_FQ void m04720_s16 (KERN_ATTR_BASIC ()) * main */ - m04720s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_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); + 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, gid_max, l_bin2asc); } diff --git a/OpenCL/m04720_a3-pure.cl b/OpenCL/m04510_a3-pure.cl similarity index 99% rename from OpenCL/m04720_a3-pure.cl rename to OpenCL/m04510_a3-pure.cl index 0f9ca0eb2..c56a27fde 100644 --- a/OpenCL/m04720_a3-pure.cl +++ b/OpenCL/m04510_a3-pure.cl @@ -135,7 +135,7 @@ KERNEL_FQ void m04500_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m04720_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04510_sxx (KERN_ATTR_VECTOR ()) { /** * base diff --git a/src/modules/module_04720.c b/src/modules/module_04510.c similarity index 99% rename from src/modules/module_04720.c rename to src/modules/module_04510.c index 78be8a5a9..8dde9f3a9 100644 --- a/src/modules/module_04720.c +++ b/src/modules/module_04510.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 1; static const u32 DGST_SIZE = DGST_SIZE_4_5; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED; static const char *HASH_NAME = "sha1(sha1($pass).$salt)"; -static const u64 KERN_TYPE = 4720; +static const u64 KERN_TYPE = 4510; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP diff --git a/tools/test_modules/m04720.pm b/tools/test_modules/m04510.pm similarity index 100% rename from tools/test_modules/m04720.pm rename to tools/test_modules/m04510.pm