From cc689caa42ad281870e21aaeffb3bb638b1debfa Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Wed, 31 Jul 2019 15:39:16 +0200 Subject: [PATCH] switch hash-mode from 1470 to 21400, cleanup credits/readme/changes txt --- ...a0-optimized.cl => m21400_a0-optimized.cl} | 12 ++++---- .../{m01470_a0-pure.cl => m21400_a0-pure.cl} | 4 +-- ...a1-optimized.cl => m21400_a1-optimized.cl} | 12 ++++---- .../{m01470_a1-pure.cl => m21400_a1-pure.cl} | 4 +-- ...a3-optimized.cl => m21400_a3-optimized.cl} | 28 +++++++++---------- .../{m01470_a3-pure.cl => m21400_a3-pure.cl} | 4 +-- docs/changes.txt | 1 - docs/credits.txt | 1 - docs/readme.txt | 1 - .../{module_01470.c => module_21400.c} | 4 +-- tools/test_modules/{m01470.pm => m21400.pm} | 0 11 files changed, 34 insertions(+), 37 deletions(-) rename OpenCL/{m01470_a0-optimized.cl => m21400_a0-optimized.cl} (99%) rename OpenCL/{m01470_a0-pure.cl => m21400_a0-pure.cl} (96%) rename OpenCL/{m01470_a1-optimized.cl => m21400_a1-optimized.cl} (99%) rename OpenCL/{m01470_a1-pure.cl => m21400_a1-pure.cl} (96%) rename OpenCL/{m01470_a3-optimized.cl => m21400_a3-optimized.cl} (98%) rename OpenCL/{m01470_a3-pure.cl => m21400_a3-pure.cl} (97%) rename src/modules/{module_01470.c => module_21400.c} (99%) rename tools/test_modules/{m01470.pm => m21400.pm} (100%) diff --git a/OpenCL/m01470_a0-optimized.cl b/OpenCL/m21400_a0-optimized.cl similarity index 99% rename from OpenCL/m01470_a0-optimized.cl rename to OpenCL/m21400_a0-optimized.cl index 5acf8ae17..0de1171c0 100644 --- a/OpenCL/m01470_a0-optimized.cl +++ b/OpenCL/m21400_a0-optimized.cl @@ -30,7 +30,7 @@ h = 0; \ } -KERNEL_FQ void m01470_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -277,15 +277,15 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m01470_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m01470_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m01470_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -565,10 +565,10 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m01470_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m01470_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01470_a0-pure.cl b/OpenCL/m21400_a0-pure.cl similarity index 96% rename from OpenCL/m01470_a0-pure.cl rename to OpenCL/m21400_a0-pure.cl index 46f2c892f..1937d53e9 100644 --- a/OpenCL/m01470_a0-pure.cl +++ b/OpenCL/m21400_a0-pure.cl @@ -16,7 +16,7 @@ #include "inc_hash_sha256.cl" #endif -KERNEL_FQ void m01470_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -91,7 +91,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m01470_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m21400_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01470_a1-optimized.cl b/OpenCL/m21400_a1-optimized.cl similarity index 99% rename from OpenCL/m01470_a1-optimized.cl rename to OpenCL/m21400_a1-optimized.cl index cfe607622..49e39d78e 100644 --- a/OpenCL/m01470_a1-optimized.cl +++ b/OpenCL/m21400_a1-optimized.cl @@ -28,7 +28,7 @@ h = 0; \ } -KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -333,15 +333,15 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m01470_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m01470_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -679,10 +679,10 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m01470_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ void m01470_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01470_a1-pure.cl b/OpenCL/m21400_a1-pure.cl similarity index 96% rename from OpenCL/m01470_a1-pure.cl rename to OpenCL/m21400_a1-pure.cl index 2ba848069..3336bf6ee 100644 --- a/OpenCL/m01470_a1-pure.cl +++ b/OpenCL/m21400_a1-pure.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha256.cl" #endif -KERNEL_FQ void m01470_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -87,7 +87,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m01470_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21400_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01470_a3-optimized.cl b/OpenCL/m21400_a3-optimized.cl similarity index 98% rename from OpenCL/m01470_a3-optimized.cl rename to OpenCL/m21400_a3-optimized.cl index 4df35b766..82cc7448b 100644 --- a/OpenCL/m01470_a3-optimized.cl +++ b/OpenCL/m21400_a3-optimized.cl @@ -28,7 +28,7 @@ h = 0; \ } -DECLSPEC void m01470m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m21400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -247,7 +247,7 @@ DECLSPEC void m01470m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -DECLSPEC void m01470s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m21400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -499,7 +499,7 @@ DECLSPEC void m01470s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m01470_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -534,10 +534,10 @@ KERNEL_FQ void m01470_m04 (KERN_ATTR_VECTOR ()) * main */ - m01470m (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); + m21400m (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); } -KERNEL_FQ void m01470_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -572,10 +572,10 @@ KERNEL_FQ void m01470_m08 (KERN_ATTR_VECTOR ()) * main */ - m01470m (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); + m21400m (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); } -KERNEL_FQ void m01470_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -610,10 +610,10 @@ KERNEL_FQ void m01470_m16 (KERN_ATTR_VECTOR ()) * main */ - m01470m (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); + m21400m (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); } -KERNEL_FQ void m01470_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -648,10 +648,10 @@ KERNEL_FQ void m01470_s04 (KERN_ATTR_VECTOR ()) * main */ - m01470s (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); + m21400s (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); } -KERNEL_FQ void m01470_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -686,10 +686,10 @@ KERNEL_FQ void m01470_s08 (KERN_ATTR_VECTOR ()) * main */ - m01470s (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); + m21400s (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); } -KERNEL_FQ void m01470_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -724,5 +724,5 @@ KERNEL_FQ void m01470_s16 (KERN_ATTR_VECTOR ()) * main */ - m01470s (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); + m21400s (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); } diff --git a/OpenCL/m01470_a3-pure.cl b/OpenCL/m21400_a3-pure.cl similarity index 97% rename from OpenCL/m01470_a3-pure.cl rename to OpenCL/m21400_a3-pure.cl index da1f34954..ed44f3b5a 100644 --- a/OpenCL/m01470_a3-pure.cl +++ b/OpenCL/m21400_a3-pure.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha256.cl" #endif -KERNEL_FQ void m01470_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -100,7 +100,7 @@ KERNEL_FQ void m01470_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m01470_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21400_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/docs/changes.txt b/docs/changes.txt index 07dc343c9..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: Double sha256 ## ## Bugs diff --git a/docs/credits.txt b/docs/credits.txt index 02f4b0873..bd21d35d7 100644 --- a/docs/credits.txt +++ b/docs/credits.txt @@ -18,7 +18,6 @@ Philipp "philsmd" Schmidt (@philsmd) Gabriele "matrix" Gristina (@gm4tr1x) -* Double sha256 kernel module * gzip wordlists feature * SHA-224 kernel module + optimizations * Some AES OpenCL kernel module optimizations diff --git a/docs/readme.txt b/docs/readme.txt index 4afef8d2c..9e36b73ce 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -84,7 +84,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o - sha1(md5(md5($pass))) - sha1($salt.$pass.$salt) - sha1(CX) -- Double sha256 - sha256($pass.$salt) - sha256($salt.$pass) - sha256(utf16le($pass).$salt) diff --git a/src/modules/module_01470.c b/src/modules/module_21400.c similarity index 99% rename from src/modules/module_01470.c rename to src/modules/module_21400.c index 100407a2d..dc92ef5c8 100644 --- a/src/modules/module_01470.c +++ b/src/modules/module_21400.c @@ -17,8 +17,8 @@ static const u32 DGST_POS2 = 2; 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 = "Double sha256"; -static const u64 KERN_TYPE = 1470; +static const char *HASH_NAME = "sha256(sha256_bin(pass))"; +static const u64 KERN_TYPE = 21400; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP diff --git a/tools/test_modules/m01470.pm b/tools/test_modules/m21400.pm similarity index 100% rename from tools/test_modules/m01470.pm rename to tools/test_modules/m21400.pm