arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-21 23:58:07 +00:00
Code Issues Releases Wiki Activity

switch hash-mode from 4410 to 20900

Browse Source
This commit is contained in:
Gabriele Gristina 2019-07-30 15:08:55 +02:00
parent ebb83bee41
commit 1b5168b95a
11 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCL/m04410_a0-optimized.cl → OpenCL/m20900_a0-optimized.cl
View File

@ -29,7 +29,7 @@
#define uint_to_hex_lower8(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 m04410_m04 (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_m04 (KERN_ATTR_RULES ())
{
/**
* modifier
@ -731,15 +731,15 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m04410_m08 (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_m08 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m04410_m16 (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_m16 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m04410_s04 (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_s04 (KERN_ATTR_RULES ())
{
/**
* modifier
@ -1456,10 +1456,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m04410_s08 (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_s08 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m04410_s16 (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_s16 (KERN_ATTR_RULES ())
{
}

4
OpenCL/m04410_a0-pure.cl → OpenCL/m20900_a0-pure.cl
View File

@ -29,7 +29,7 @@
#define uint_to_hex_lower8(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 m04410_mxx (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_mxx (KERN_ATTR_RULES ())
{
/**
* modifier
@ -209,7 +209,7 @@ KERNEL_FQ void m04410_mxx (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m04410_sxx (KERN_ATTR_RULES ())
KERNEL_FQ void m20900_sxx (KERN_ATTR_RULES ())
{
/**
* modifier

12
OpenCL/m04410_a1-optimized.cl → OpenCL/m20900_a1-optimized.cl
View File

@ -27,7 +27,7 @@
#define uint_to_hex_lower8(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 m04410_m04 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -787,15 +787,15 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m04410_m08 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_m08 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m04410_m16 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_m16 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m04410_s04 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -1570,10 +1570,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m04410_s08 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_s08 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m04410_s16 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_s16 (KERN_ATTR_BASIC ())
{
}

4
OpenCL/m04410_a1-pure.cl → OpenCL/m20900_a1-pure.cl
View File

@ -27,7 +27,7 @@
#define uint_to_hex_lower8(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 m04410_mxx (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_mxx (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -209,7 +209,7 @@ KERNEL_FQ void m04410_mxx (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m04410_sxx (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_sxx (KERN_ATTR_BASIC ())
{
/**
* modifier

28
OpenCL/m04410_a3-optimized.cl → OpenCL/m20900_a3-optimized.cl
View File

@ -27,7 +27,7 @@
#define uint_to_hex_lower8(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
DECLSPEC void m04410m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc)
DECLSPEC void m20900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc)
{
/**
* modifier
@ -688,7 +688,7 @@ DECLSPEC void m04410m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
}
}
DECLSPEC void m04410s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc)
DECLSPEC void m20900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc)
{
/**
* modifier
@ -1364,7 +1364,7 @@ DECLSPEC void m04410s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER
}
}
KERNEL_FQ void m04410_m04 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_m04 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1431,10 +1431,10 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_BASIC ())
* main
*/
m04410m (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);
m20900m (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 m04410_m08 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_m08 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1501,10 +1501,10 @@ KERNEL_FQ void m04410_m08 (KERN_ATTR_BASIC ())
* main
*/
m04410m (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);
m20900m (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 m04410_m16 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_m16 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1571,10 +1571,10 @@ KERNEL_FQ void m04410_m16 (KERN_ATTR_BASIC ())
* main
*/
m04410m (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);
m20900m (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 m04410_s04 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_s04 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1641,10 +1641,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_BASIC ())
* main
*/
m04410s (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);
m20900s (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 m04410_s08 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_s08 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1711,10 +1711,10 @@ KERNEL_FQ void m04410_s08 (KERN_ATTR_BASIC ())
* main
*/
m04410s (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);
m20900s (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 m04410_s16 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20900_s16 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1781,5 +1781,5 @@ KERNEL_FQ void m04410_s16 (KERN_ATTR_BASIC ())
* main
*/
m04410s (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);
m20900s (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/m04410_a3-pure.cl → OpenCL/m20900_a3-pure.cl
View File

@ -27,7 +27,7 @@
#define uint_to_hex_lower8(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 m04410_mxx (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20900_mxx (KERN_ATTR_VECTOR ())
{
/**
* modifier
@ -218,7 +218,7 @@ KERNEL_FQ void m04410_mxx (KERN_ATTR_VECTOR ())
}
}
KERNEL_FQ void m04410_sxx (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20900_sxx (KERN_ATTR_VECTOR ())
{
/**
* modifier

1
docs/changes.txt
View File

@ -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: md5(sha1($pass).md5($pass).sha1($pass))
##
## 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)
* md5(sha1($pass).md5($pass).sha1($pass)) kernel module
* gzip wordlists feature
* SHA-224 kernel module + optimizations
* Some AES OpenCL kernel module optimizations

1
docs/readme.txt
View File

@ -74,7 +74,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o
- md5(md5($pass).md5($salt))
- md5(strtoupper(md5($pass)))
- md5(sha1($pass))
- md5(sha1($pass).md5($pass).sha1($pass))
- sha1($pass.$salt)
- sha1($salt.$pass)
- sha1(utf16le($pass).$salt)

2
src/modules/module_04410.c → src/modules/module_20900.c
View File

@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 1;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED;
static const char *HASH_NAME = "md5(sha1($pass).md5($pass).sha1($pass))";
static const u64 KERN_TYPE = 4410;
static const u64 KERN_TYPE = 20900;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_EARLY_SKIP

0
tools/test_modules/m04410.pm → tools/test_modules/m20900.pm
View File