From 20c6a70b5956e4fb4ae711007a1583c272df856d Mon Sep 17 00:00:00 2001 From: Zgzorx Date: Mon, 20 Feb 2023 14:41:22 +0100 Subject: [PATCH] Rename SM3 module : m31100 --- ...a0-optimized.cl => m31100_a0-optimized.cl} | 12 ++++---- .../{m36000_a0-pure.cl => m31100_a0-pure.cl} | 4 +-- ...a1-optimized.cl => m31100_a1-optimized.cl} | 12 ++++---- .../{m36000_a1-pure.cl => m31100_a1-pure.cl} | 4 +-- ...a3-optimized.cl => m31100_a3-optimized.cl} | 28 +++++++++---------- .../{m36000_a3-pure.cl => m31100_a3-pure.cl} | 4 +-- .../{module_36000.c => module_31100.c} | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) rename OpenCL/{m36000_a0-optimized.cl => m31100_a0-optimized.cl} (98%) rename OpenCL/{m36000_a0-pure.cl => m31100_a0-pure.cl} (95%) rename OpenCL/{m36000_a1-optimized.cl => m31100_a1-optimized.cl} (98%) rename OpenCL/{m36000_a1-pure.cl => m31100_a1-pure.cl} (95%) rename OpenCL/{m36000_a3-optimized.cl => m31100_a3-optimized.cl} (96%) rename OpenCL/{m36000_a3-pure.cl => m31100_a3-pure.cl} (96%) rename src/modules/{module_36000.c => module_31100.c} (99%) diff --git a/OpenCL/m36000_a0-optimized.cl b/OpenCL/m31100_a0-optimized.cl similarity index 98% rename from OpenCL/m36000_a0-optimized.cl rename to OpenCL/m31100_a0-optimized.cl index 63018f8ad..b24143c08 100644 --- a/OpenCL/m36000_a0-optimized.cl +++ b/OpenCL/m31100_a0-optimized.cl @@ -16,7 +16,7 @@ #include M2S(INCLUDE_PATH/inc_hash_sm3.cl) #endif -KERNEL_FQ void m36000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -163,15 +163,15 @@ KERNEL_FQ void m36000_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m36000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m36000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m36000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -330,10 +330,10 @@ KERNEL_FQ void m36000_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m36000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m36000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m36000_a0-pure.cl b/OpenCL/m31100_a0-pure.cl similarity index 95% rename from OpenCL/m36000_a0-pure.cl rename to OpenCL/m31100_a0-pure.cl index be3d1c6d9..18c1e2795 100644 --- a/OpenCL/m36000_a0-pure.cl +++ b/OpenCL/m31100_a0-pure.cl @@ -16,7 +16,7 @@ #include M2S(INCLUDE_PATH/inc_hash_sm3.cl) #endif -KERNEL_FQ void m36000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -60,7 +60,7 @@ KERNEL_FQ void m36000_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m36000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m31100_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m36000_a1-optimized.cl b/OpenCL/m31100_a1-optimized.cl similarity index 98% rename from OpenCL/m36000_a1-optimized.cl rename to OpenCL/m31100_a1-optimized.cl index f357c6abe..aaef407f0 100644 --- a/OpenCL/m36000_a1-optimized.cl +++ b/OpenCL/m31100_a1-optimized.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_sm3.cl) #endif -KERNEL_FQ void m36000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -219,15 +219,15 @@ KERNEL_FQ void m36000_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m36000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m36000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m36000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -444,10 +444,10 @@ KERNEL_FQ void m36000_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m36000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m36000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m36000_a1-pure.cl b/OpenCL/m31100_a1-pure.cl similarity index 95% rename from OpenCL/m36000_a1-pure.cl rename to OpenCL/m31100_a1-pure.cl index aa544bc80..43d42204a 100644 --- a/OpenCL/m36000_a1-pure.cl +++ b/OpenCL/m31100_a1-pure.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_sm3.cl) #endif -KERNEL_FQ void m36000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -56,7 +56,7 @@ KERNEL_FQ void m36000_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m36000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31100_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m36000_a3-optimized.cl b/OpenCL/m31100_a3-optimized.cl similarity index 96% rename from OpenCL/m36000_a3-optimized.cl rename to OpenCL/m31100_a3-optimized.cl index 3c52d33e5..5804be68c 100644 --- a/OpenCL/m36000_a3-optimized.cl +++ b/OpenCL/m31100_a3-optimized.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_sm3.cl) #endif -DECLSPEC void m36000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m31100m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -130,7 +130,7 @@ DECLSPEC void m36000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO } } -DECLSPEC void m36000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m31100s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -258,7 +258,7 @@ DECLSPEC void m36000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO } } -KERNEL_FQ void m36000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -295,10 +295,10 @@ KERNEL_FQ void m36000_m04 (KERN_ATTR_VECTOR ()) * main */ - m36000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m31100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ void m36000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -335,10 +335,10 @@ KERNEL_FQ void m36000_m08 (KERN_ATTR_VECTOR ()) * main */ - m36000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m31100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ void m36000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -375,10 +375,10 @@ KERNEL_FQ void m36000_m16 (KERN_ATTR_VECTOR ()) * main */ - m36000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m31100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ void m36000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -415,10 +415,10 @@ KERNEL_FQ void m36000_s04 (KERN_ATTR_VECTOR ()) * main */ - m36000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m31100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ void m36000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -455,10 +455,10 @@ KERNEL_FQ void m36000_s08 (KERN_ATTR_VECTOR ()) * main */ - m36000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m31100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ void m36000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -495,5 +495,5 @@ KERNEL_FQ void m36000_s16 (KERN_ATTR_VECTOR ()) * main */ - m36000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m31100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } diff --git a/OpenCL/m36000_a3-pure.cl b/OpenCL/m31100_a3-pure.cl similarity index 96% rename from OpenCL/m36000_a3-pure.cl rename to OpenCL/m31100_a3-pure.cl index 9c205e6de..01dea33eb 100644 --- a/OpenCL/m36000_a3-pure.cl +++ b/OpenCL/m31100_a3-pure.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_sm3.cl) #endif -KERNEL_FQ void m36000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -69,7 +69,7 @@ KERNEL_FQ void m36000_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m36000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/src/modules/module_36000.c b/src/modules/module_31100.c similarity index 99% rename from src/modules/module_36000.c rename to src/modules/module_31100.c index 50bf7ce9a..bd9d83bb2 100644 --- a/src/modules/module_36000.c +++ b/src/modules/module_31100.c @@ -18,7 +18,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; static const char *HASH_NAME = "SM3"; -static const u64 KERN_TYPE = 36000; +static const u64 KERN_TYPE = 31100; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP