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

switch hash-mode from 1770 to 21000

Browse Source
This commit is contained in:
Gabriele Gristina 2019-07-30 15:15:49 +02:00
parent 1a110b4f71
commit bba2ee65a2
9 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCL/m01770_a0-optimized.cl → OpenCL/m21000_a0-optimized.cl
View File

@ -125,7 +125,7 @@ DECLSPEC void sha512_transform_opt (const u32x *w0, const u32x *w1, const u32x *
digest[7] = h; digest[7] = h;
} }
KERNEL_FQ void m01770_m04 (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_m04 (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier
@ -266,15 +266,15 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_RULES ())
} }
} }
KERNEL_FQ void m01770_m08 (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_m08 (KERN_ATTR_RULES ())
{ {
} }
KERNEL_FQ void m01770_m16 (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_m16 (KERN_ATTR_RULES ())
{ {
} }
KERNEL_FQ void m01770_s04 (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_s04 (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier
@ -427,10 +427,10 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_RULES ())
} }
} }
KERNEL_FQ void m01770_s08 (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_s08 (KERN_ATTR_RULES ())
{ {
} }
KERNEL_FQ void m01770_s16 (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_s16 (KERN_ATTR_RULES ())
{ {
} }

4
OpenCL/m01770_a0-pure.cl → OpenCL/m21000_a0-pure.cl
View File

@ -16,7 +16,7 @@
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#endif #endif
KERNEL_FQ void m01770_mxx (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_mxx (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier
@ -87,7 +87,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_RULES ())
} }
} }
KERNEL_FQ void m01770_sxx (KERN_ATTR_RULES ()) KERNEL_FQ void m21000_sxx (KERN_ATTR_RULES ())
{ {
/** /**
* modifier * modifier

12
OpenCL/m01770_a1-optimized.cl → OpenCL/m21000_a1-optimized.cl
View File

@ -218,7 +218,7 @@ DECLSPEC void sha512_transform_opt (const u32x *w0, const u32x *w1, const u32x *
digest[7] = h; digest[7] = h;
} }
KERNEL_FQ void m01770_m04 (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_m04 (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * modifier
@ -397,15 +397,15 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_BASIC ())
} }
} }
KERNEL_FQ void m01770_m08 (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_m08 (KERN_ATTR_BASIC ())
{ {
} }
KERNEL_FQ void m01770_m16 (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_m16 (KERN_ATTR_BASIC ())
{ {
} }
KERNEL_FQ void m01770_s04 (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_s04 (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * modifier
@ -596,10 +596,10 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_BASIC ())
} }
} }
KERNEL_FQ void m01770_s08 (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_s08 (KERN_ATTR_BASIC ())
{ {
} }
KERNEL_FQ void m01770_s16 (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_s16 (KERN_ATTR_BASIC ())
{ {
} }

4
OpenCL/m01770_a1-pure.cl → OpenCL/m21000_a1-pure.cl
View File

@ -14,7 +14,7 @@
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#endif #endif
KERNEL_FQ void m01770_mxx (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_mxx (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * modifier
@ -83,7 +83,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_BASIC ())
} }
} }
KERNEL_FQ void m01770_sxx (KERN_ATTR_BASIC ()) KERNEL_FQ void m21000_sxx (KERN_ATTR_BASIC ())
{ {
/** /**
* modifier * modifier

28
OpenCL/m01770_a3-optimized.cl → OpenCL/m21000_a3-optimized.cl
View File

@ -218,7 +218,7 @@ DECLSPEC void sha512_transform_opt (const u32x *w0, const u32x *w1, const u32x *
digest[7] = h; digest[7] = h;
} }
DECLSPEC void m01770m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) DECLSPEC void m21000m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * modifier
@ -311,7 +311,7 @@ DECLSPEC void m01770m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ())
} }
} }
DECLSPEC void m01770s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) DECLSPEC void m21000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * modifier
@ -416,7 +416,7 @@ DECLSPEC void m01770s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ())
} }
} }
KERNEL_FQ void m01770_m04 (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_m04 (KERN_ATTR_VECTOR ())
{ {
/** /**
* base * base
@ -451,10 +451,10 @@ KERNEL_FQ void m01770_m04 (KERN_ATTR_VECTOR ())
* main * main
*/ */
m01770m (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); m21000m (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 m01770_m08 (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_m08 (KERN_ATTR_VECTOR ())
{ {
/** /**
* base * base
@ -489,10 +489,10 @@ KERNEL_FQ void m01770_m08 (KERN_ATTR_VECTOR ())
* main * main
*/ */
m01770m (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); m21000m (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 m01770_m16 (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_m16 (KERN_ATTR_VECTOR ())
{ {
/** /**
* base * base
@ -527,10 +527,10 @@ KERNEL_FQ void m01770_m16 (KERN_ATTR_VECTOR ())
* main * main
*/ */
m01770m (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); m21000m (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 m01770_s04 (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_s04 (KERN_ATTR_VECTOR ())
{ {
/** /**
* base * base
@ -565,10 +565,10 @@ KERNEL_FQ void m01770_s04 (KERN_ATTR_VECTOR ())
* main * main
*/ */
m01770s (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); m21000s (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 m01770_s08 (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_s08 (KERN_ATTR_VECTOR ())
{ {
/** /**
* base * base
@ -603,10 +603,10 @@ KERNEL_FQ void m01770_s08 (KERN_ATTR_VECTOR ())
* main * main
*/ */
m01770s (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); m21000s (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 m01770_s16 (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_s16 (KERN_ATTR_VECTOR ())
{ {
/** /**
* base * base
@ -641,5 +641,5 @@ KERNEL_FQ void m01770_s16 (KERN_ATTR_VECTOR ())
* main * main
*/ */
m01770s (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); m21000s (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);
} }

4
OpenCL/m01770_a3-pure.cl → OpenCL/m21000_a3-pure.cl
View File

@ -14,7 +14,7 @@
#include "inc_hash_sha512.cl" #include "inc_hash_sha512.cl"
#endif #endif
KERNEL_FQ void m01770_mxx (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_mxx (KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * modifier
@ -96,7 +96,7 @@ KERNEL_FQ void m01770_mxx (KERN_ATTR_VECTOR ())
} }
} }
KERNEL_FQ void m01770_sxx (KERN_ATTR_VECTOR ()) KERNEL_FQ void m21000_sxx (KERN_ATTR_VECTOR ())
{ {
/** /**
* modifier * modifier

1
docs/readme.txt
View File

@ -92,7 +92,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o
- sha512($salt.$pass) - sha512($salt.$pass)
- sha512(utf16le($pass).$salt) - sha512(utf16le($pass).$salt)
- sha512($salt.utf16le($pass)) - sha512($salt.utf16le($pass))
- BitShares v0.x - sha512(sha512(pass))
- HMAC-MD5 (key = $pass) - HMAC-MD5 (key = $pass)
- HMAC-MD5 (key = $salt) - HMAC-MD5 (key = $salt)
- HMAC-SHA1 (key = $pass) - HMAC-SHA1 (key = $pass)

2
src/modules/module_01770.c → src/modules/module_21000.c
View File

@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 7;
static const u32 DGST_SIZE = DGST_SIZE_8_8; static const u32 DGST_SIZE = DGST_SIZE_8_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH;
static const char *HASH_NAME = "BitShares v0.x - sha512(sha512(pass))"; static const char *HASH_NAME = "BitShares v0.x - sha512(sha512(pass))";
static const u64 KERN_TYPE = 1770; static const u64 KERN_TYPE = 21000;
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/m01770.pm → tools/test_modules/m21000.pm
View File