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

switch hash-mode from 19400 to 20700

Browse Source
This commit is contained in:
Gabriele Gristina 2019-07-29 17:16:53 +02:00
parent 973a972324
commit c1d15d613b
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCL/m19400_a0-optimized.cl → OpenCL/m20700_a0-optimized.cl
View File

@ -42,7 +42,7 @@
h = 0; \
}
KERNEL_FQ void m19400_m04 (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_m04 (KERN_ATTR_RULES ())
{
/**
* modifier
@ -493,15 +493,15 @@ KERNEL_FQ void m19400_m04 (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m19400_m08 (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_m08 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m19400_m16 (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_m16 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m19400_s04 (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_s04 (KERN_ATTR_RULES ())
{
/**
* modifier
@ -961,10 +961,10 @@ KERNEL_FQ void m19400_s04 (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m19400_s08 (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_s08 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m19400_s16 (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_s16 (KERN_ATTR_RULES ())
{
}

4
OpenCL/m19400_a0-pure.cl → OpenCL/m20700_a0-pure.cl
View File

@ -28,7 +28,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 m19400_mxx (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_mxx (KERN_ATTR_RULES ())
{
/**
* modifier
@ -140,7 +140,7 @@ KERNEL_FQ void m19400_mxx (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m19400_sxx (KERN_ATTR_RULES ())
KERNEL_FQ void m20700_sxx (KERN_ATTR_RULES ())
{
/**
* modifier

12
OpenCL/m19400_a1-optimized.cl → OpenCL/m20700_a1-optimized.cl
View File

@ -40,7 +40,7 @@
h = 0; \
}
KERNEL_FQ void m19400_m04 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_m04 (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -549,15 +549,15 @@ KERNEL_FQ void m19400_m04 (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m19400_m08 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_m08 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m19400_m16 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_m16 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m19400_s04 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_s04 (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -1075,10 +1075,10 @@ KERNEL_FQ void m19400_s04 (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m19400_s08 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_s08 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m19400_s16 (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_s16 (KERN_ATTR_BASIC ())
{
}

4
OpenCL/m19400_a1-pure.cl → OpenCL/m20700_a1-pure.cl
View File

@ -26,7 +26,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 m19400_mxx (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_mxx (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -136,7 +136,7 @@ KERNEL_FQ void m19400_mxx (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m19400_sxx (KERN_ATTR_BASIC ())
KERNEL_FQ void m20700_sxx (KERN_ATTR_BASIC ())
{
/**
* modifier

28
OpenCL/m19400_a3-optimized.cl → OpenCL/m20700_a3-optimized.cl
View File

@ -40,7 +40,7 @@
h = 0; \
}
DECLSPEC void m19400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc)
DECLSPEC void m20700m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc)
{
/**
* modifier
@ -450,7 +450,7 @@ DECLSPEC void m19400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u
}
}
DECLSPEC void m19400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc)
DECLSPEC void m20700s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u32 *l_bin2asc)
{
/**
* modifier
@ -875,7 +875,7 @@ DECLSPEC void m19400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR (), LOCAL_AS u
}
}
KERNEL_FQ void m19400_m04 (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_m04 (KERN_ATTR_VECTOR ())
{
/**
* base
@ -933,10 +933,10 @@ KERNEL_FQ void m19400_m04 (KERN_ATTR_VECTOR ())
* main
*/
m19400m (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, l_bin2asc);
m20700m (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, l_bin2asc);
}
KERNEL_FQ void m19400_m08 (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_m08 (KERN_ATTR_VECTOR ())
{
/**
* base
@ -994,10 +994,10 @@ KERNEL_FQ void m19400_m08 (KERN_ATTR_VECTOR ())
* main
*/
m19400m (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, l_bin2asc);
m20700m (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, l_bin2asc);
}
KERNEL_FQ void m19400_m16 (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_m16 (KERN_ATTR_VECTOR ())
{
/**
* base
@ -1055,10 +1055,10 @@ KERNEL_FQ void m19400_m16 (KERN_ATTR_VECTOR ())
* main
*/
m19400m (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, l_bin2asc);
m20700m (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, l_bin2asc);
}
KERNEL_FQ void m19400_s04 (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_s04 (KERN_ATTR_VECTOR ())
{
/**
* base
@ -1116,10 +1116,10 @@ KERNEL_FQ void m19400_s04 (KERN_ATTR_VECTOR ())
* main
*/
m19400s (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, l_bin2asc);
m20700s (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, l_bin2asc);
}
KERNEL_FQ void m19400_s08 (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_s08 (KERN_ATTR_VECTOR ())
{
/**
* base
@ -1177,10 +1177,10 @@ KERNEL_FQ void m19400_s08 (KERN_ATTR_VECTOR ())
* main
*/
m19400s (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, l_bin2asc);
m20700s (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, l_bin2asc);
}
KERNEL_FQ void m19400_s16 (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_s16 (KERN_ATTR_VECTOR ())
{
/**
* base
@ -1238,5 +1238,5 @@ KERNEL_FQ void m19400_s16 (KERN_ATTR_VECTOR ())
* main
*/
m19400s (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, l_bin2asc);
m20700s (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, l_bin2asc);
}

4
OpenCL/m19400_a3-pure.cl → OpenCL/m20700_a3-pure.cl
View File

@ -26,7 +26,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 m19400_mxx (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_mxx (KERN_ATTR_VECTOR ())
{
/**
* modifier
@ -149,7 +149,7 @@ KERNEL_FQ void m19400_mxx (KERN_ATTR_VECTOR ())
}
}
KERNEL_FQ void m19400_sxx (KERN_ATTR_VECTOR ())
KERNEL_FQ void m20700_sxx (KERN_ATTR_VECTOR ())
{
/**
* modifier

2
src/modules/module_19400.c → src/modules/module_20700.c
View File

@ -19,7 +19,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 = "AuthMe - sha256(sha256($pass).$salt)";
static const u64 KERN_TYPE = 19400;
static const u64 KERN_TYPE = 20700;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_EARLY_SKIP

0
tools/test_modules/m19400.pm → tools/test_modules/m20700.pm
View File