arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00
Code Issues Releases Wiki Activity

switch hash-mode from 4710 to 20800

Browse Source
This commit is contained in:
Gabriele Gristina 2019-07-30 14:44:17 +02:00
parent 1aef49d11b
commit f2d92d8aec
10 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCL/m04710_a0-optimized.cl → OpenCL/m20800_a0-optimized.cl
View File

@ -43,7 +43,7 @@
h = 0; \ h = 0; \
} }
KERNEL_FQ void m04710_m04 (KERN_ATTR_RULES ()) KERNEL_FQ void m20800_m04 (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * 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 * 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 ())
{ {
} }

4
OpenCL/m04710_a0-pure.cl → OpenCL/m20800_a0-pure.cl
View File

@ -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]) #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 #endif
KERNEL_FQ void m04710_mxx (KERN_ATTR_RULES ()) KERNEL_FQ void m20800_mxx (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * 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 * modifier

12
OpenCL/m04710_a1-optimized.cl → OpenCL/m20800_a1-optimized.cl
View File

@ -41,7 +41,7 @@
h = 0; \ h = 0; \
} }
KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ()) KERNEL_FQ void m20800_m04 (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * 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 * 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 ())
{ {
} }

4
OpenCL/m04710_a1-pure.cl → OpenCL/m20800_a1-pure.cl
View File

@ -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]) #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 #endif
KERNEL_FQ void m04710_mxx (KERN_ATTR_BASIC ()) KERNEL_FQ void m20800_mxx (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * 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 * modifier

28
OpenCL/m04710_a3-optimized.cl → OpenCL/m20800_a3-optimized.cl
View File

@ -41,7 +41,7 @@
h = 0; \ 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 * 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 * 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 * base
@ -613,10 +613,10 @@ KERNEL_FQ void m04710_m04 (KERN_ATTR_BASIC ())
* main * 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 * base
@ -683,10 +683,10 @@ KERNEL_FQ void m04710_m08 (KERN_ATTR_BASIC ())
* main * 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 * base
@ -753,10 +753,10 @@ KERNEL_FQ void m04710_m16 (KERN_ATTR_BASIC ())
* main * 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 * base
@ -823,10 +823,10 @@ KERNEL_FQ void m04710_s04 (KERN_ATTR_BASIC ())
* main * 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 * base
@ -893,10 +893,10 @@ KERNEL_FQ void m04710_s08 (KERN_ATTR_BASIC ())
* main * 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 * base
@ -963,5 +963,5 @@ KERNEL_FQ void m04710_s16 (KERN_ATTR_BASIC ())
* main * 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);
} }

4
OpenCL/m04710_a3-pure.cl → OpenCL/m20800_a3-pure.cl
View File

@ -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]) #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 #endif
KERNEL_FQ void m04710_mxx (KERN_ATTR_VECTOR ()) KERNEL_FQ void m20800_mxx (KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * 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 * modifier

1
docs/changes.txt
View File

@ -35,7 +35,6 @@
- Added hash-mode: Python passlib pbkdf2-sha256 - Added hash-mode: Python passlib pbkdf2-sha256
- Added hash-mode: Python passlib pbkdf2-sha512 - Added hash-mode: Python passlib pbkdf2-sha512
- Added hash-mode: Oracle Transportation Management (SHA256) - Added hash-mode: Oracle Transportation Management (SHA256)
- Added hash-mode: sha256(md5($pass))
## ##
## Bugs ## Bugs

1
docs/credits.txt
View File

@ -18,7 +18,6 @@ Philipp "philsmd" Schmidt <philsmd@hashcat.net> (@philsmd)
Gabriele "matrix" Gristina <matrix@hashcat.net> (@gm4tr1x) Gabriele "matrix" Gristina <matrix@hashcat.net> (@gm4tr1x)
* sha256(md5(pass)) kernel module
* gzip wordlists feature * gzip wordlists feature
* SHA-224 kernel module + optimizations * SHA-224 kernel module + optimizations
* Some AES OpenCL kernel module optimizations * Some AES OpenCL kernel module optimizations

2
src/modules/module_04710.c → src/modules/module_20800.c
View File

@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 6;
static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 DGST_SIZE = DGST_SIZE_4_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED;
static const char *HASH_NAME = "sha256(md5($pass))"; 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 static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_EARLY_SKIP | OPTI_TYPE_EARLY_SKIP

0
tools/test_modules/m04710.pm → tools/test_modules/m20800.pm
View File