diff --git a/OpenCL/m35000_a0-optimized.cl b/OpenCL/m31000_a0-optimized.cl similarity index 92% rename from OpenCL/m35000_a0-optimized.cl rename to OpenCL/m31000_a0-optimized.cl index bf1694445..fbebe24f4 100644 --- a/OpenCL/m35000_a0-optimized.cl +++ b/OpenCL/m31000_a0-optimized.cl @@ -16,7 +16,7 @@ #include M2S(INCLUDE_PATH/inc_hash_blake2s.cl) #endif -KERNEL_FQ void m35000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_m04 (KERN_ATTR_RULES ()) { /** * base @@ -94,15 +94,15 @@ KERNEL_FQ void m35000_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m35000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m35000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m35000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_s04 (KERN_ATTR_RULES ()) { /** * base @@ -190,10 +190,10 @@ KERNEL_FQ void m35000_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m35000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m35000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m35000_a0-pure.cl b/OpenCL/m31000_a0-pure.cl similarity index 95% rename from OpenCL/m35000_a0-pure.cl rename to OpenCL/m31000_a0-pure.cl index 07db0954a..d6fdb0a51 100644 --- a/OpenCL/m35000_a0-pure.cl +++ b/OpenCL/m31000_a0-pure.cl @@ -16,7 +16,7 @@ #include M2S(INCLUDE_PATH/inc_hash_blake2s.cl) #endif -KERNEL_FQ void m35000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_mxx (KERN_ATTR_RULES ()) { /** * base @@ -57,7 +57,7 @@ KERNEL_FQ void m35000_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m35000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m31000_sxx (KERN_ATTR_RULES ()) { /** * base diff --git a/OpenCL/m35000_a1-optimized.cl b/OpenCL/m31000_a1-optimized.cl similarity index 95% rename from OpenCL/m35000_a1-optimized.cl rename to OpenCL/m31000_a1-optimized.cl index 8196980e1..edc4580de 100644 --- a/OpenCL/m35000_a1-optimized.cl +++ b/OpenCL/m31000_a1-optimized.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_blake2s.cl) #endif -KERNEL_FQ void m35000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -142,15 +142,15 @@ KERNEL_FQ void m35000_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m35000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m35000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m35000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -290,10 +290,10 @@ KERNEL_FQ void m35000_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m35000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m35000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m35000_a1-pure.cl b/OpenCL/m31000_a1-pure.cl similarity index 95% rename from OpenCL/m35000_a1-pure.cl rename to OpenCL/m31000_a1-pure.cl index 9c1d45547..e90aa0d46 100644 --- a/OpenCL/m35000_a1-pure.cl +++ b/OpenCL/m31000_a1-pure.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_blake2s.cl) #endif -KERNEL_FQ void m35000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_mxx (KERN_ATTR_BASIC ()) { /** * base @@ -55,7 +55,7 @@ KERNEL_FQ void m35000_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m35000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m31000_sxx (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m35000_a3-optimized.cl b/OpenCL/m31000_a3-optimized.cl similarity index 91% rename from OpenCL/m35000_a3-optimized.cl rename to OpenCL/m31000_a3-optimized.cl index ec5f903db..876542c05 100644 --- a/OpenCL/m35000_a3-optimized.cl +++ b/OpenCL/m31000_a3-optimized.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_blake2s.cl) #endif -DECLSPEC void m35000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m31000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -84,7 +84,7 @@ DECLSPEC void m35000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO } } -DECLSPEC void m35000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m31000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -166,7 +166,7 @@ DECLSPEC void m35000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO } } -KERNEL_FQ void m35000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -203,10 +203,10 @@ KERNEL_FQ void m35000_m04 (KERN_ATTR_VECTOR ()) * main */ - m35000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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); + m31000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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 m35000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -243,10 +243,10 @@ KERNEL_FQ void m35000_m08 (KERN_ATTR_VECTOR ()) * main */ - m35000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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); + m31000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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 m35000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -283,10 +283,10 @@ KERNEL_FQ void m35000_m16 (KERN_ATTR_VECTOR ()) * main */ - m35000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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); + m31000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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 m35000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -323,10 +323,10 @@ KERNEL_FQ void m35000_s04 (KERN_ATTR_VECTOR ()) * main */ - m35000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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); + m31000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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 m35000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -363,10 +363,10 @@ KERNEL_FQ void m35000_s08 (KERN_ATTR_VECTOR ()) * main */ - m35000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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); + m31000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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 m35000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -403,5 +403,5 @@ KERNEL_FQ void m35000_s16 (KERN_ATTR_VECTOR ()) * main */ - m35000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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); + m31000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_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/m35000_a3-pure.cl b/OpenCL/m31000_a3-pure.cl similarity index 96% rename from OpenCL/m35000_a3-pure.cl rename to OpenCL/m31000_a3-pure.cl index edf01db97..24ce691db 100644 --- a/OpenCL/m35000_a3-pure.cl +++ b/OpenCL/m31000_a3-pure.cl @@ -14,7 +14,7 @@ #include M2S(INCLUDE_PATH/inc_hash_blake2s.cl) #endif -KERNEL_FQ void m35000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -66,7 +66,7 @@ KERNEL_FQ void m35000_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m35000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m31000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/src/modules/module_35000.c b/src/modules/module_31000.c similarity index 99% rename from src/modules/module_35000.c rename to src/modules/module_31000.c index 3c36c99a9..cf35180ac 100644 --- a/src/modules/module_35000.c +++ b/src/modules/module_31000.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 2; static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const char *HASH_NAME = "BLAKE2s-256"; -static const u64 KERN_TYPE = 35000; +static const u64 KERN_TYPE = 31000; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_32 | OPTI_TYPE_RAW_HASH; static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE | OPTS_TYPE_PT_GENERATE_LE; static const u32 SALT_TYPE = SALT_TYPE_NONE; diff --git a/tools/test_modules/m35000.pm b/tools/test_modules/m31000.pm similarity index 100% rename from tools/test_modules/m35000.pm rename to tools/test_modules/m31000.pm