From f2d92d8aec11d8af5e4bf6eedd4cfae342da82d5 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 30 Jul 2019 14:44:17 +0200 Subject: [PATCH] switch hash-mode from 4710 to 20800 --- ...a0-optimized.cl => m20800_a0-optimized.cl} | 12 ++++---- .../{m04710_a0-pure.cl => m20800_a0-pure.cl} | 4 +-- ...a1-optimized.cl => m20800_a1-optimized.cl} | 12 ++++---- .../{m04710_a1-pure.cl => m20800_a1-pure.cl} | 4 +-- ...a3-optimized.cl => m20800_a3-optimized.cl} | 28 +++++++++---------- .../{m04710_a3-pure.cl => m20800_a3-pure.cl} | 4 +-- docs/changes.txt | 1 - docs/credits.txt | 1 - .../{module_04710.c => module_20800.c} | 2 +- tools/test_modules/{m04710.pm => m20800.pm} | 0 10 files changed, 33 insertions(+), 35 deletions(-) rename OpenCL/{m04710_a0-optimized.cl => m20800_a0-optimized.cl} (99%) rename OpenCL/{m04710_a0-pure.cl => m20800_a0-pure.cl} (98%) rename OpenCL/{m04710_a1-optimized.cl => m20800_a1-optimized.cl} (99%) rename OpenCL/{m04710_a1-pure.cl => m20800_a1-pure.cl} (98%) rename OpenCL/{m04710_a3-optimized.cl => m20800_a3-optimized.cl} (97%) rename OpenCL/{m04710_a3-pure.cl => m20800_a3-pure.cl} (98%) rename src/modules/{module_04710.c => module_20800.c} (99%) rename tools/test_modules/{m04710.pm => m20800.pm} (100%) diff --git a/OpenCL/m04710_a0-optimized.cl b/OpenCL/m20800_a0-optimized.cl similarity index 99% rename from OpenCL/m04710_a0-optimized.cl rename to OpenCL/m20800_a0-optimized.cl index d2f365c25..d428df4f0 100644 --- a/OpenCL/m04710_a0-optimized.cl +++ b/OpenCL/m20800_a0-optimized.cl @@ -43,7 +43,7 @@ h = 0; \ } -KERNEL_FQ void m04710_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -306,15 +306,15 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04710_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m04710_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -610,10 +610,10 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04710_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m04710_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04710_a0-pure.cl b/OpenCL/m20800_a0-pure.cl similarity index 98% rename from OpenCL/m04710_a0-pure.cl rename to OpenCL/m20800_a0-pure.cl index 966463126..01ce1a6ad 100644 --- a/OpenCL/m04710_a0-pure.cl +++ b/OpenCL/m20800_a0-pure.cl @@ -29,7 +29,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 m04710_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -130,7 +130,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04710_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m20800_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m04710_a1-optimized.cl b/OpenCL/m20800_a1-optimized.cl similarity index 99% rename from OpenCL/m04710_a1-optimized.cl rename to OpenCL/m20800_a1-optimized.cl index e510b235b..6ec1be3da 100644 --- a/OpenCL/m04710_a1-optimized.cl +++ b/OpenCL/m20800_a1-optimized.cl @@ -41,7 +41,7 @@ h = 0; \ } -KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -359,15 +359,15 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m04710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m04710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -718,10 +718,10 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m04710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m04710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04710_a1-pure.cl b/OpenCL/m20800_a1-pure.cl similarity index 98% rename from OpenCL/m04710_a1-pure.cl rename to OpenCL/m20800_a1-pure.cl index 044b07058..1bce6143a 100644 --- a/OpenCL/m04710_a1-pure.cl +++ b/OpenCL/m20800_a1-pure.cl @@ -27,7 +27,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 m04710_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -126,7 +126,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m04710_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04710_a3-optimized.cl b/OpenCL/m20800_a3-optimized.cl similarity index 97% rename from OpenCL/m04710_a3-optimized.cl rename to OpenCL/m20800_a3-optimized.cl index 4651c8d43..8ddfcc703 100644 --- a/OpenCL/m04710_a3-optimized.cl +++ b/OpenCL/m20800_a3-optimized.cl @@ -41,7 +41,7 @@ h = 0; \ } -DECLSPEC void m04710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) +DECLSPEC void m20800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -277,7 +277,7 @@ DECLSPEC void m04710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) +DECLSPEC void m20800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -546,7 +546,7 @@ DECLSPEC void m04710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -613,10 +613,10 @@ 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, 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, 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 m04710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -683,10 +683,10 @@ 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, 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, 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 m04710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -753,10 +753,10 @@ 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, 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, 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 m04710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -823,10 +823,10 @@ 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, 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, 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 m04710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -893,10 +893,10 @@ 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, 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, 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 m04710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m20800_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -963,5 +963,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, 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, 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/m04710_a3-pure.cl b/OpenCL/m20800_a3-pure.cl similarity index 98% rename from OpenCL/m04710_a3-pure.cl rename to OpenCL/m20800_a3-pure.cl index 449da471d..9cb333ba1 100644 --- a/OpenCL/m04710_a3-pure.cl +++ b/OpenCL/m20800_a3-pure.cl @@ -27,7 +27,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 m04710_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20800_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -139,7 +139,7 @@ KERNEL_FQ void m04710_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m04710_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m20800_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/docs/changes.txt b/docs/changes.txt index 7062e62af..0bb228187 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -35,7 +35,6 @@ - Added hash-mode: Python passlib pbkdf2-sha256 - Added hash-mode: Python passlib pbkdf2-sha512 - Added hash-mode: Oracle Transportation Management (SHA256) -- Added hash-mode: sha256(md5($pass)) ## ## Bugs diff --git a/docs/credits.txt b/docs/credits.txt index c89524dab..bd21d35d7 100644 --- a/docs/credits.txt +++ b/docs/credits.txt @@ -18,7 +18,6 @@ Philipp "philsmd" Schmidt (@philsmd) Gabriele "matrix" Gristina (@gm4tr1x) -* sha256(md5(pass)) kernel module * gzip wordlists feature * SHA-224 kernel module + optimizations * Some AES OpenCL kernel module optimizations diff --git a/src/modules/module_04710.c b/src/modules/module_20800.c similarity index 99% rename from src/modules/module_04710.c rename to src/modules/module_20800.c index 95fbdffbb..1613d607f 100644 --- a/src/modules/module_04710.c +++ b/src/modules/module_20800.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_SALTED; static const char *HASH_NAME = "sha256(md5($pass))"; -static const u64 KERN_TYPE = 4710; +static const u64 KERN_TYPE = 20800; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP diff --git a/tools/test_modules/m04710.pm b/tools/test_modules/m20800.pm similarity index 100% rename from tools/test_modules/m04710.pm rename to tools/test_modules/m20800.pm